[media] rtl2832_sdr: cleanup some set_bit() calls
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 14 May 2015 08:39:17 +0000 (05:39 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 20 May 2015 16:45:15 +0000 (13:45 -0300)
This code works fine but static checkers complain.  The test_bit()
function takes the bit number and not a mask.  Then the other issue is
that we were using USB_STATE_URB_BUF which is BIT(0) instead of URB_BUF.
Also we were open coding that instead of using the test/clear/set_bit()
functions.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/dvb-frontends/rtl2832_sdr.c

index c501bcd680b502466027c077d135c2f728c173aa..7edb885ae9c8689cdbc9009831ee28b78b58ee98 100644 (file)
@@ -112,8 +112,8 @@ struct rtl2832_sdr_frame_buf {
 };
 
 struct rtl2832_sdr_dev {
-#define POWER_ON           (1 << 1)
-#define URB_BUF            (1 << 2)
+#define POWER_ON           0  /* BIT(0) */
+#define URB_BUF            1  /* BIT(1) */
        unsigned long flags;
 
        struct platform_device *pdev;
@@ -356,7 +356,7 @@ static int rtl2832_sdr_free_stream_bufs(struct rtl2832_sdr_dev *dev)
 {
        struct platform_device *pdev = dev->pdev;
 
-       if (dev->flags & USB_STATE_URB_BUF) {
+       if (test_bit(URB_BUF, &dev->flags)) {
                while (dev->buf_num) {
                        dev->buf_num--;
                        dev_dbg(&pdev->dev, "free buf=%d\n", dev->buf_num);
@@ -365,7 +365,7 @@ static int rtl2832_sdr_free_stream_bufs(struct rtl2832_sdr_dev *dev)
                                          dev->dma_addr[dev->buf_num]);
                }
        }
-       dev->flags &= ~USB_STATE_URB_BUF;
+       clear_bit(URB_BUF, &dev->flags);
 
        return 0;
 }
@@ -394,7 +394,7 @@ static int rtl2832_sdr_alloc_stream_bufs(struct rtl2832_sdr_dev *dev)
                dev_dbg(&pdev->dev, "alloc buf=%d %p (dma %llu)\n",
                        dev->buf_num, dev->buf_list[dev->buf_num],
                        (long long)dev->dma_addr[dev->buf_num]);
-               dev->flags |= USB_STATE_URB_BUF;
+               set_bit(URB_BUF, &dev->flags);
        }
 
        return 0;