Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / pvrusb2 / pvrusb2-debugifc.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
index 586900e365ff2eaac9062028b8347efbb81dfc19..e9da9bb8f8dea1f8901b1428c48b2cc1ce95c8cc 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
@@ -82,7 +82,7 @@ static unsigned int debugifc_isolate_word(const char *buf,unsigned int count,
        unsigned int wlen;
        unsigned int scnt;
 
-       wptr = 0;
+       wptr = NULL;
        wlen = 0;
        scnt = debugifc_count_whitespace(buf,count);
        consume_cnt += scnt; count -= scnt; buf += scnt;
@@ -152,7 +152,7 @@ static unsigned long debugifc_find_mask(const char *buf,unsigned int count)
 {
        struct debugifc_mask_item *mip;
        unsigned int idx;
-       for (idx = 0; idx < sizeof(mask_items)/sizeof(mask_items[0]); idx++) {
+       for (idx = 0; idx < ARRAY_SIZE(mask_items); idx++) {
                mip = mask_items + idx;
                if (debugifc_match_keyword(buf,count,mip->name)) {
                        return mip->msk;
@@ -169,7 +169,7 @@ static int debugifc_print_mask(char *buf,unsigned int sz,
        unsigned int idx;
        int bcnt = 0;
        int ccnt;
-       for (idx = 0; idx < sizeof(mask_items)/sizeof(mask_items[0]); idx++) {
+       for (idx = 0; idx < ARRAY_SIZE(mask_items); idx++) {
                mip = mask_items + idx;
                if (!(mip->msk & msk)) continue;
                ccnt = scnprintf(buf,sz,"%s%c%s",
@@ -337,8 +337,8 @@ int pvr2_debugifc_print_status(struct pvr2_hdw *hdw,
 }
 
 
-int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf,
-                        unsigned int count)
+static int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf,
+                               unsigned int count)
 {
        const char *wptr;
        unsigned int wlen;