[media] airspy: fix bit set/clean mess on s->flags
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sat, 27 Feb 2016 10:51:07 +0000 (07:51 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 1 Mar 2016 13:48:17 +0000 (10:48 -0300)
As warned by smatch:
drivers/media/usb/airspy/airspy.c:541 airspy_start_streaming() warn: test_bit() takes a bit number
drivers/media/usb/airspy/airspy.c:569 airspy_start_streaming() warn: test_bit() takes a bit number
drivers/media/usb/airspy/airspy.c:605 airspy_stop_streaming() warn: test_bit() takes a bit number

set_bit/clear_bit argument is the bit number, and not 1 << bit.

Thankfully, one of the bits was not used (URB_BUF), with would
otherwise cause a driver misfunctioning.

Clean this mess by always using set_bit/clear_bit/test_bit and
removing the unused bit.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/airspy/airspy.c

index 0d4ac59..87c1293 100644 (file)
@@ -104,9 +104,8 @@ struct airspy_frame_buf {
 };
 
 struct airspy {
-#define POWER_ON           (1 << 1)
-#define URB_BUF            (1 << 2)
-#define USB_STATE_URB_BUF  (1 << 3)
+#define POWER_ON          1
+#define USB_STATE_URB_BUF  2
        unsigned long flags;
 
        struct device *dev;
@@ -359,7 +358,7 @@ static int airspy_submit_urbs(struct airspy *s)
 
 static int airspy_free_stream_bufs(struct airspy *s)
 {
-       if (s->flags & USB_STATE_URB_BUF) {
+       if (test_bit(USB_STATE_URB_BUF, &s->flags)) {
                while (s->buf_num) {
                        s->buf_num--;
                        dev_dbg(s->dev, "free buf=%d\n", s->buf_num);
@@ -368,7 +367,7 @@ static int airspy_free_stream_bufs(struct airspy *s)
                                          s->dma_addr[s->buf_num]);
                }
        }
-       s->flags &= ~USB_STATE_URB_BUF;
+       clear_bit(USB_STATE_URB_BUF, &s->flags);
 
        return 0;
 }
@@ -394,7 +393,7 @@ static int airspy_alloc_stream_bufs(struct airspy *s)
                dev_dbg(s->dev, "alloc buf=%d %p (dma %llu)\n", s->buf_num,
                                s->buf_list[s->buf_num],
                                (long long)s->dma_addr[s->buf_num]);
-               s->flags |= USB_STATE_URB_BUF;
+               set_bit(USB_STATE_URB_BUF, &s->flags);
        }
 
        return 0;