[2/2] Driver: video: Use the macro DMA_BIT_MASK().

Message ID 1329819211-8359-1-git-send-email-santoshprasadnayak@gmail.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

santosh nayak Feb. 21, 2012, 10:13 a.m. UTC
  From: Santosh Nayak <santoshprasadnayak@gmail.com>

Use the macro DMA_BIT_MASK instead of the constant  0xffffffff.

Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com>
---
 drivers/media/video/cx18/cx18-driver.c |    4 ++--
 drivers/media/video/ivtv/ivtv-driver.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
  

Comments

santosh nayak March 5, 2012, 8:04 p.m. UTC | #1
Can you please comment on it ?

Regards
Santosh

On Tue, Feb 21, 2012 at 3:43 PM, santosh nayak
<santoshprasadnayak@gmail.com> wrote:
> From: Santosh Nayak <santoshprasadnayak@gmail.com>
>
> Use the macro DMA_BIT_MASK instead of the constant  0xffffffff.
>
> Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com>
> ---
>  drivers/media/video/cx18/cx18-driver.c |    4 ++--
>  drivers/media/video/ivtv/ivtv-driver.c |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
> index 349bd9c..08118e5 100644
> --- a/drivers/media/video/cx18/cx18-driver.c
> +++ b/drivers/media/video/cx18/cx18-driver.c
> @@ -38,7 +38,7 @@
>  #include "cx18-ioctl.h"
>  #include "cx18-controls.h"
>  #include "tuner-xc2028.h"
> -
> +#include <linux/dma-mapping.h>
>  #include <media/tveeprom.h>
>
>  /* If you have already X v4l cards, then set this to X. This way
> @@ -812,7 +812,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev,
>                CX18_ERR("Can't enable device %d!\n", cx->instance);
>                return -EIO;
>        }
> -       if (pci_set_dma_mask(pci_dev, 0xffffffff)) {
> +       if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
>                CX18_ERR("No suitable DMA available, card %d\n", cx->instance);
>                return -EIO;
>        }
> diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
> index 107e9e6..d84e5df 100644
> --- a/drivers/media/video/ivtv/ivtv-driver.c
> +++ b/drivers/media/video/ivtv/ivtv-driver.c
> @@ -55,7 +55,7 @@
>  #include "ivtv-routing.h"
>  #include "ivtv-controls.h"
>  #include "ivtv-gpio.h"
> -
> +#include <linux/dma-mapping.h>
>  #include <media/tveeprom.h>
>  #include <media/saa7115.h>
>  #include <media/v4l2-chip-ident.h>
> @@ -813,7 +813,7 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
>                IVTV_ERR("Can't enable device!\n");
>                return -EIO;
>        }
> -       if (pci_set_dma_mask(pdev, 0xffffffff)) {
> +       if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
>                IVTV_ERR("No suitable DMA available.\n");
>                return -EIO;
>        }
> --
> 1.7.4.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Patch

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 349bd9c..08118e5 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -38,7 +38,7 @@ 
 #include "cx18-ioctl.h"
 #include "cx18-controls.h"
 #include "tuner-xc2028.h"
-
+#include <linux/dma-mapping.h>
 #include <media/tveeprom.h>
 
 /* If you have already X v4l cards, then set this to X. This way
@@ -812,7 +812,7 @@  static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev,
 		CX18_ERR("Can't enable device %d!\n", cx->instance);
 		return -EIO;
 	}
-	if (pci_set_dma_mask(pci_dev, 0xffffffff)) {
+	if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
 		CX18_ERR("No suitable DMA available, card %d\n", cx->instance);
 		return -EIO;
 	}
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 107e9e6..d84e5df 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -55,7 +55,7 @@ 
 #include "ivtv-routing.h"
 #include "ivtv-controls.h"
 #include "ivtv-gpio.h"
-
+#include <linux/dma-mapping.h>
 #include <media/tveeprom.h>
 #include <media/saa7115.h>
 #include <media/v4l2-chip-ident.h>
@@ -813,7 +813,7 @@  static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
 		IVTV_ERR("Can't enable device!\n");
 		return -EIO;
 	}
-	if (pci_set_dma_mask(pdev, 0xffffffff)) {
+	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
 		IVTV_ERR("No suitable DMA available.\n");
 		return -EIO;
 	}