diff options
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/bttvp.h | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa6752hs.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa6752hs.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 6 |
7 files changed, 17 insertions, 17 deletions
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h index d978cd97d..205f149e3 100644 --- a/linux/drivers/media/video/bttvp.h +++ b/linux/drivers/media/video/bttvp.h @@ -1,5 +1,5 @@ /* - $Id: bttvp.h,v 1.13 2004/11/19 18:07:12 kraxel Exp $ + $Id: bttvp.h,v 1.14 2004/11/23 17:29:09 kraxel Exp $ bttv - Bt848 frame grabber driver @@ -287,7 +287,7 @@ struct bttv { /* pci device config */ unsigned short id; unsigned char revision; - unsigned char *bt848_mmio; /* pointer to mmio */ + unsigned char __iomem *bt848_mmio; /* pointer to mmio */ /* card configuration info */ unsigned int cardid; /* pci subsystem id (bt878 based ones) */ @@ -401,7 +401,7 @@ struct bttv { #endif -#define btwrite(dat,adr) writel((dat), (char *) (btv->bt848_mmio+(adr))) +#define btwrite(dat,adr) writel((dat), btv->bt848_mmio+(adr)) #define btread(adr) readl(btv->bt848_mmio+(adr)) #define btand(dat,adr) btwrite((dat) & btread(adr), adr) diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 9b183166f..66c33af6b 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.16 2004/11/17 18:47:47 kraxel Exp $ + * $Id: cx88-core.c,v 1.17 2004/11/23 17:29:09 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -1131,7 +1131,7 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci) cx88_pci_quirks(core->name, pci); core->lmmio = ioremap(pci_resource_start(pci,0), pci_resource_len(pci,0)); - core->bmmio = (u8*)core->lmmio; + core->bmmio = (u8 __iomem *)core->lmmio; /* board config */ core->board = UNSET; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 8100f5d4d..ce82fa859 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.40 2004/11/03 09:04:51 kraxel Exp $ + * $Id: cx88.h,v 1.41 2004/11/23 17:29:09 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -236,8 +236,8 @@ struct cx88_core { /* pci stuff */ int pci_bus; int pci_slot; - u32 *lmmio; - u8 *bmmio; + u32 __iomem *lmmio; + u8 __iomem *bmmio; u32 shadow[SHADOW_MAX]; /* i2c i/o */ diff --git a/linux/drivers/media/video/saa6752hs.c b/linux/drivers/media/video/saa6752hs.c index cea922a8b..875a71383 100644 --- a/linux/drivers/media/video/saa6752hs.c +++ b/linux/drivers/media/video/saa6752hs.c @@ -276,7 +276,7 @@ static void saa6752hs_set_params(struct i2c_client* client, h->params.ts_pid_video = params->ts_pid_video; if (params->ts_pid_audio <= MPEG_PID_MAX) h->params.ts_pid_audio = params->ts_pid_audio; - + /* check bitrate parameters */ if ((params->vi_bitrate.mode == V4L2_BITRATE_CBR) || (params->vi_bitrate.mode == V4L2_BITRATE_VBR)) @@ -289,7 +289,7 @@ static void saa6752hs_set_params(struct i2c_client* client, h->params.vi_bitrate.max = params->vi_bitrate.max; if (params->au_bitrate.mode != V4L2_BITRATE_NONE) h->params.au_bitrate.target = params->au_bitrate.target; - + /* range checks */ if (h->params.st_bitrate.target > MPEG_TOTAL_TARGET_BITRATE_MAX) h->params.st_bitrate.target = MPEG_TOTAL_TARGET_BITRATE_MAX; diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c index cea922a8b..875a71383 100644 --- a/linux/drivers/media/video/saa7134/saa6752hs.c +++ b/linux/drivers/media/video/saa7134/saa6752hs.c @@ -276,7 +276,7 @@ static void saa6752hs_set_params(struct i2c_client* client, h->params.ts_pid_video = params->ts_pid_video; if (params->ts_pid_audio <= MPEG_PID_MAX) h->params.ts_pid_audio = params->ts_pid_audio; - + /* check bitrate parameters */ if ((params->vi_bitrate.mode == V4L2_BITRATE_CBR) || (params->vi_bitrate.mode == V4L2_BITRATE_VBR)) @@ -289,7 +289,7 @@ static void saa6752hs_set_params(struct i2c_client* client, h->params.vi_bitrate.max = params->vi_bitrate.max; if (params->au_bitrate.mode != V4L2_BITRATE_NONE) h->params.au_bitrate.target = params->au_bitrate.target; - + /* range checks */ if (h->params.st_bitrate.target > MPEG_TOTAL_TARGET_BITRATE_MAX) h->params.st_bitrate.target = MPEG_TOTAL_TARGET_BITRATE_MAX; diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index af270b581..484bad66b 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.19 2004/11/19 18:07:12 kraxel Exp $ + * $Id: saa7134-core.c,v 1.20 2004/11/23 17:29:09 kraxel Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -913,7 +913,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, goto fail1; } dev->lmmio = ioremap(pci_resource_start(pci_dev,0), 0x1000); - dev->bmmio = (__u8*)dev->lmmio; + dev->bmmio = (__u8 __iomem *)dev->lmmio; if (NULL == dev->lmmio) { err = -EIO; printk(KERN_ERR "%s: can't ioremap() MMIO memory\n", diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index a14445fe4..c621c80f7 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.30 2004/11/22 18:10:55 kraxel Exp $ + * $Id: saa7134.h,v 1.31 2004/11/23 17:29:09 kraxel Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -404,8 +404,8 @@ struct saa7134_dev { int nr; struct pci_dev *pci; unsigned char pci_rev,pci_lat; - __u32 *lmmio; - __u8 *bmmio; + __u32 __iomem *lmmio; + __u8 __iomem *bmmio; /* config info */ unsigned int board; |