* [PATCH 1/6] drivers/media: add missing __devexit_p() annotations
2012-05-03 22:22 [PATCH 0/6] drivers/media: randconfig patches for kernel 3.4 mathieu.poirier
@ 2012-05-03 22:22 ` mathieu.poirier
2012-05-03 22:22 ` [PATCH 2/6] v4l/dvb: fix Kconfig dependencies on VIDEO_CAPTURE_DRIVERS mathieu.poirier
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: mathieu.poirier @ 2012-05-03 22:22 UTC (permalink / raw)
To: mchehab; +Cc: linux-media, linux-kernel, arnd, mathieu.poirier
From: Arnd Bergmann <arnd@arndb.de>
Drivers that refer to a __devexit function in an operations
structure need to annotate that pointer with __devexit_p so
replace it with a NULL pointer when the section gets discarded.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/media/dvb/ddbridge/ddbridge-core.c | 2 +-
drivers/media/radio/radio-timb.c | 2 +-
drivers/media/radio/saa7706h.c | 2 +-
drivers/media/radio/tef6862.c | 2 +-
drivers/media/rc/imon.c | 2 +-
drivers/media/rc/mceusb.c | 2 +-
drivers/media/rc/redrat3.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
index d88c4aa..ef4c0f8 100644
--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
@@ -1696,7 +1696,7 @@ static struct pci_driver ddb_pci_driver = {
.name = "DDBridge",
.id_table = ddb_id_tbl,
.probe = ddb_probe,
- .remove = ddb_remove,
+ .remove = __devexit_p(ddb_remove),
};
static __init int module_init_ddbridge(void)
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c
index 5d9a90a..7052adc 100644
--- a/drivers/media/radio/radio-timb.c
+++ b/drivers/media/radio/radio-timb.c
@@ -223,7 +223,7 @@ static struct platform_driver timbradio_platform_driver = {
.owner = THIS_MODULE,
},
.probe = timbradio_probe,
- .remove = timbradio_remove,
+ .remove = __devexit_p(timbradio_remove),
};
module_platform_driver(timbradio_platform_driver);
diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index 9474706..bb953ef 100644
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -430,7 +430,7 @@ static struct i2c_driver saa7706h_driver = {
.name = DRIVER_NAME,
},
.probe = saa7706h_probe,
- .remove = saa7706h_remove,
+ .remove = __devexit_p(saa7706h_remove),
.id_table = saa7706h_id,
};
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index 6418c4c..06d47e5 100644
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -211,7 +211,7 @@ static struct i2c_driver tef6862_driver = {
.name = DRIVER_NAME,
},
.probe = tef6862_probe,
- .remove = tef6862_remove,
+ .remove = __devexit_p(tef6862_remove),
.id_table = tef6862_id,
};
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 7f26fdf..5dd0386 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -255,7 +255,7 @@ static struct usb_device_id imon_usb_id_table[] = {
static struct usb_driver imon_driver = {
.name = MOD_NAME,
.probe = imon_probe,
- .disconnect = imon_disconnect,
+ .disconnect = __devexit_p(imon_disconnect),
.suspend = imon_suspend,
.resume = imon_resume,
.id_table = imon_usb_id_table,
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index e150a2e..845cae3 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -1443,7 +1443,7 @@ static int mceusb_dev_resume(struct usb_interface *intf)
static struct usb_driver mceusb_dev_driver = {
.name = DRIVER_NAME,
.probe = mceusb_dev_probe,
- .disconnect = mceusb_dev_disconnect,
+ .disconnect = __devexit_p(mceusb_dev_disconnect),
.suspend = mceusb_dev_suspend,
.resume = mceusb_dev_resume,
.reset_resume = mceusb_dev_resume,
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index ad95c67..2878b0e 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -1277,7 +1277,7 @@ static int redrat3_dev_resume(struct usb_interface *intf)
static struct usb_driver redrat3_dev_driver = {
.name = DRIVER_NAME,
.probe = redrat3_dev_probe,
- .disconnect = redrat3_dev_disconnect,
+ .disconnect = __devexit_p(redrat3_dev_disconnect),
.suspend = redrat3_dev_suspend,
.resume = redrat3_dev_resume,
.reset_resume = redrat3_dev_resume,
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/6] v4l/dvb: fix Kconfig dependencies on VIDEO_CAPTURE_DRIVERS
2012-05-03 22:22 [PATCH 0/6] drivers/media: randconfig patches for kernel 3.4 mathieu.poirier
2012-05-03 22:22 ` [PATCH 1/6] drivers/media: add missing __devexit_p() annotations mathieu.poirier
@ 2012-05-03 22:22 ` mathieu.poirier
2012-05-15 10:44 ` Mauro Carvalho Chehab
2012-05-03 22:22 ` [PATCH 3/6] media/rc: IR_SONY_DECODER depends on BITREVERSE mathieu.poirier
` (3 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: mathieu.poirier @ 2012-05-03 22:22 UTC (permalink / raw)
To: mchehab; +Cc: linux-media, linux-kernel, arnd, mathieu.poirier
From: Arnd Bergmann <arnd@arndb.de>
Kconfig warns about unsatisfied dependencies of symbols that
are directly selected.
Many capture drivers depend on DVB capture drivers, which
are hidden behind the CONFIG_DVB_CAPTURE_DRIVERS setting.
The solution here is to enable DVB_CAPTURE_DRIVERS unconditionally
when both DVB and VIDEO_CAPTURE_DRIVERS are enabled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/media/dvb/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index f6e40b3..c617996 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -29,7 +29,7 @@ config DVB_DYNAMIC_MINORS
If you are unsure about this, say N here.
menuconfig DVB_CAPTURE_DRIVERS
- bool "DVB/ATSC adapters"
+ bool "DVB/ATSC adapters" if !VIDEO_CAPTURE_DRIVERS
depends on DVB_CORE
default y
---help---
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/6] v4l/dvb: fix Kconfig dependencies on VIDEO_CAPTURE_DRIVERS
2012-05-03 22:22 ` [PATCH 2/6] v4l/dvb: fix Kconfig dependencies on VIDEO_CAPTURE_DRIVERS mathieu.poirier
@ 2012-05-15 10:44 ` Mauro Carvalho Chehab
2012-05-15 10:47 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2012-05-15 10:44 UTC (permalink / raw)
To: mathieu.poirier; +Cc: mchehab, linux-media, linux-kernel, arnd
Em 03-05-2012 19:22, mathieu.poirier@linaro.org escreveu:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Kconfig warns about unsatisfied dependencies of symbols that
> are directly selected.
>
> Many capture drivers depend on DVB capture drivers, which
> are hidden behind the CONFIG_DVB_CAPTURE_DRIVERS setting.
>
> The solution here is to enable DVB_CAPTURE_DRIVERS unconditionally
> when both DVB and VIDEO_CAPTURE_DRIVERS are enabled.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
> drivers/media/dvb/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
> index f6e40b3..c617996 100644
> --- a/drivers/media/dvb/Kconfig
> +++ b/drivers/media/dvb/Kconfig
> @@ -29,7 +29,7 @@ config DVB_DYNAMIC_MINORS
> If you are unsure about this, say N here.
>
> menuconfig DVB_CAPTURE_DRIVERS
> - bool "DVB/ATSC adapters"
> + bool "DVB/ATSC adapters" if !VIDEO_CAPTURE_DRIVERS
> depends on DVB_CORE
> default y
> ---help---
No, this is not right. Users can select either DVB or V4L2 (or hybrid)
devices independently.
If now a warning is happening, is because something changed Kconfig
behavior on some non-expected way.
Nack.
Regards,
Mauro
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/6] v4l/dvb: fix Kconfig dependencies on VIDEO_CAPTURE_DRIVERS
2012-05-15 10:44 ` Mauro Carvalho Chehab
@ 2012-05-15 10:47 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2012-05-15 10:47 UTC (permalink / raw)
To: mathieu.poirier; +Cc: mchehab, linux-media, linux-kernel, arnd
Em 15-05-2012 07:44, Mauro Carvalho Chehab escreveu:
> Em 03-05-2012 19:22, mathieu.poirier@linaro.org escreveu:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> Kconfig warns about unsatisfied dependencies of symbols that
>> are directly selected.
>>
>> Many capture drivers depend on DVB capture drivers, which
>> are hidden behind the CONFIG_DVB_CAPTURE_DRIVERS setting.
>>
>> The solution here is to enable DVB_CAPTURE_DRIVERS unconditionally
>> when both DVB and VIDEO_CAPTURE_DRIVERS are enabled.
>>
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
>> ---
>> drivers/media/dvb/Kconfig | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
>> index f6e40b3..c617996 100644
>> --- a/drivers/media/dvb/Kconfig
>> +++ b/drivers/media/dvb/Kconfig
>> @@ -29,7 +29,7 @@ config DVB_DYNAMIC_MINORS
>> If you are unsure about this, say N here.
>>
>> menuconfig DVB_CAPTURE_DRIVERS
>> - bool "DVB/ATSC adapters"
>> + bool "DVB/ATSC adapters" if !VIDEO_CAPTURE_DRIVERS
>> depends on DVB_CORE
>> default y
>> ---help---
>
> No, this is not right. Users can select either DVB or V4L2 (or hybrid)
> devices independently.
>
> If now a warning is happening, is because something changed Kconfig
> behavior on some non-expected way.
I remember a similar bug in the past that it was solved by using a new
Kconfig dialect "visible if".
Not sure it this applies here.
>
> Nack.
>
> Regards,
> Mauro
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/6] media/rc: IR_SONY_DECODER depends on BITREVERSE
2012-05-03 22:22 [PATCH 0/6] drivers/media: randconfig patches for kernel 3.4 mathieu.poirier
2012-05-03 22:22 ` [PATCH 1/6] drivers/media: add missing __devexit_p() annotations mathieu.poirier
2012-05-03 22:22 ` [PATCH 2/6] v4l/dvb: fix Kconfig dependencies on VIDEO_CAPTURE_DRIVERS mathieu.poirier
@ 2012-05-03 22:22 ` mathieu.poirier
2012-05-03 22:22 ` [PATCH 4/6] media/video: add I2C dependencies mathieu.poirier
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: mathieu.poirier @ 2012-05-03 22:22 UTC (permalink / raw)
To: mchehab; +Cc: linux-media, linux-kernel, arnd, mathieu.poirier
From: Arnd Bergmann <arnd@arndb.de>
The IR sony decoder is making use of 'bitrev8' that,
in turn, requires BITREVERSE.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/media/rc/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index a3fbb21..f97eeb8 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -69,6 +69,7 @@ config IR_JVC_DECODER
config IR_SONY_DECODER
tristate "Enable IR raw decoder for the Sony protocol"
depends on RC_CORE
+ select BITREVERSE
default y
---help---
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/6] media/video: add I2C dependencies
2012-05-03 22:22 [PATCH 0/6] drivers/media: randconfig patches for kernel 3.4 mathieu.poirier
` (2 preceding siblings ...)
2012-05-03 22:22 ` [PATCH 3/6] media/rc: IR_SONY_DECODER depends on BITREVERSE mathieu.poirier
@ 2012-05-03 22:22 ` mathieu.poirier
2012-05-03 22:22 ` [PATCH 5/6] dvb/drxd: stub out drxd_attach when not built mathieu.poirier
2012-05-03 22:22 ` [PATCH 6/6] video/omap24xxcam: use __iomem annotations mathieu.poirier
5 siblings, 0 replies; 9+ messages in thread
From: mathieu.poirier @ 2012-05-03 22:22 UTC (permalink / raw)
To: mchehab; +Cc: linux-media, linux-kernel, arnd, mathieu.poirier
From: Arnd Bergmann <arnd@arndb.de>
Davinci VIDEO_VPFE_CAPTURE depends on I2C, so reflect that
in Kconfig to avoid build failures in random configurations.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/media/video/davinci/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/davinci/Kconfig b/drivers/media/video/davinci/Kconfig
index 60a456e..9337b56 100644
--- a/drivers/media/video/davinci/Kconfig
+++ b/drivers/media/video/davinci/Kconfig
@@ -40,6 +40,7 @@ config VIDEO_VPSS_SYSTEM
config VIDEO_VPFE_CAPTURE
tristate "VPFE Video Capture Driver"
depends on VIDEO_V4L2 && (ARCH_DAVINCI || ARCH_OMAP3)
+ depends on I2C
select VIDEOBUF_DMA_CONTIG
help
Support for DMx/AMx VPFE based frame grabber. This is the
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/6] dvb/drxd: stub out drxd_attach when not built
2012-05-03 22:22 [PATCH 0/6] drivers/media: randconfig patches for kernel 3.4 mathieu.poirier
` (3 preceding siblings ...)
2012-05-03 22:22 ` [PATCH 4/6] media/video: add I2C dependencies mathieu.poirier
@ 2012-05-03 22:22 ` mathieu.poirier
2012-05-03 22:22 ` [PATCH 6/6] video/omap24xxcam: use __iomem annotations mathieu.poirier
5 siblings, 0 replies; 9+ messages in thread
From: mathieu.poirier @ 2012-05-03 22:22 UTC (permalink / raw)
To: mchehab; +Cc: linux-media, linux-kernel, arnd, mathieu.poirier
From: Arnd Bergmann <arnd@arndb.de>
This avoids getting
drivers/media/video/em28xx/em28xx-dvb.c:721: \
undefined reference to `drxd_attach'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/media/dvb/frontends/drxd.h | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/drivers/media/dvb/frontends/drxd.h b/drivers/media/dvb/frontends/drxd.h
index 3439873..216c8c3 100644
--- a/drivers/media/dvb/frontends/drxd.h
+++ b/drivers/media/dvb/frontends/drxd.h
@@ -51,9 +51,23 @@ struct drxd_config {
s16(*osc_deviation) (void *priv, s16 dev, int flag);
};
+#if defined(CONFIG_DVB_DRXD) || \
+ (defined(CONFIG_DVB_DRXD_MODULE) && defined(MODULE))
extern
struct dvb_frontend *drxd_attach(const struct drxd_config *config,
void *priv, struct i2c_adapter *i2c,
struct device *dev);
+#else
+static inline
+struct dvb_frontend *drxd_attach(const struct drxd_config *config,
+ void *priv, struct i2c_adapter *i2c,
+ struct device *dev)
+{
+ printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
+ __func__);
+ return NULL;
+}
+#endif
+
extern int drxd_config_i2c(struct dvb_frontend *, int);
#endif
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/6] video/omap24xxcam: use __iomem annotations
2012-05-03 22:22 [PATCH 0/6] drivers/media: randconfig patches for kernel 3.4 mathieu.poirier
` (4 preceding siblings ...)
2012-05-03 22:22 ` [PATCH 5/6] dvb/drxd: stub out drxd_attach when not built mathieu.poirier
@ 2012-05-03 22:22 ` mathieu.poirier
5 siblings, 0 replies; 9+ messages in thread
From: mathieu.poirier @ 2012-05-03 22:22 UTC (permalink / raw)
To: mchehab; +Cc: linux-media, linux-kernel, arnd, mathieu.poirier
From: Arnd Bergmann <arnd@arndb.de>
MMIO registers are __iomem tokens in virtual address space,
not integers.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/media/video/omap24xxcam-dma.c | 20 ++++++++++----------
drivers/media/video/omap24xxcam.c | 3 +--
drivers/media/video/omap24xxcam.h | 14 +++++++-------
3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/drivers/media/video/omap24xxcam-dma.c b/drivers/media/video/omap24xxcam-dma.c
index 3ea38a8..b5ae170 100644
--- a/drivers/media/video/omap24xxcam-dma.c
+++ b/drivers/media/video/omap24xxcam-dma.c
@@ -38,7 +38,7 @@
*/
/* Ack all interrupt on CSR and IRQSTATUS_L0 */
-static void omap24xxcam_dmahw_ack_all(unsigned long base)
+static void omap24xxcam_dmahw_ack_all(void __iomem *base)
{
u32 csr;
int i;
@@ -52,7 +52,7 @@ static void omap24xxcam_dmahw_ack_all(unsigned long base)
}
/* Ack dmach on CSR and IRQSTATUS_L0 */
-static u32 omap24xxcam_dmahw_ack_ch(unsigned long base, int dmach)
+static u32 omap24xxcam_dmahw_ack_ch(void __iomem *base, int dmach)
{
u32 csr;
@@ -65,12 +65,12 @@ static u32 omap24xxcam_dmahw_ack_ch(unsigned long base, int dmach)
return csr;
}
-static int omap24xxcam_dmahw_running(unsigned long base, int dmach)
+static int omap24xxcam_dmahw_running(void __iomem *base, int dmach)
{
return omap24xxcam_reg_in(base, CAMDMA_CCR(dmach)) & CAMDMA_CCR_ENABLE;
}
-static void omap24xxcam_dmahw_transfer_setup(unsigned long base, int dmach,
+static void omap24xxcam_dmahw_transfer_setup(void __iomem *base, int dmach,
dma_addr_t start, u32 len)
{
omap24xxcam_reg_out(base, CAMDMA_CCR(dmach),
@@ -112,7 +112,7 @@ static void omap24xxcam_dmahw_transfer_setup(unsigned long base, int dmach,
| CAMDMA_CICR_DROP_IE);
}
-static void omap24xxcam_dmahw_transfer_start(unsigned long base, int dmach)
+static void omap24xxcam_dmahw_transfer_start(void __iomem *base, int dmach)
{
omap24xxcam_reg_out(base, CAMDMA_CCR(dmach),
CAMDMA_CCR_SEL_SRC_DST_SYNC
@@ -124,7 +124,7 @@ static void omap24xxcam_dmahw_transfer_start(unsigned long base, int dmach)
| CAMDMA_CCR_SYNCHRO_CAMERA);
}
-static void omap24xxcam_dmahw_transfer_chain(unsigned long base, int dmach,
+static void omap24xxcam_dmahw_transfer_chain(void __iomem *base, int dmach,
int free_dmach)
{
int prev_dmach, ch;
@@ -160,7 +160,7 @@ static void omap24xxcam_dmahw_transfer_chain(unsigned long base, int dmach,
* controller may not be idle after this routine completes, because
* the completion routines might start new transfers.
*/
-static void omap24xxcam_dmahw_abort_ch(unsigned long base, int dmach)
+static void omap24xxcam_dmahw_abort_ch(void __iomem *base, int dmach)
{
/* mask all interrupts from this channel */
omap24xxcam_reg_out(base, CAMDMA_CICR(dmach), 0);
@@ -171,7 +171,7 @@ static void omap24xxcam_dmahw_abort_ch(unsigned long base, int dmach)
omap24xxcam_reg_merge(base, CAMDMA_CCR(dmach), 0, CAMDMA_CCR_ENABLE);
}
-static void omap24xxcam_dmahw_init(unsigned long base)
+static void omap24xxcam_dmahw_init(void __iomem *base)
{
omap24xxcam_reg_out(base, CAMDMA_OCP_SYSCONFIG,
CAMDMA_OCP_SYSCONFIG_MIDLEMODE_FSTANDBY
@@ -362,7 +362,7 @@ void omap24xxcam_dma_hwinit(struct omap24xxcam_dma *dma)
}
static void omap24xxcam_dma_init(struct omap24xxcam_dma *dma,
- unsigned long base)
+ void __iomem *base)
{
int ch;
@@ -577,7 +577,7 @@ void omap24xxcam_sgdma_sync(struct omap24xxcam_sgdma *sgdma)
}
void omap24xxcam_sgdma_init(struct omap24xxcam_sgdma *sgdma,
- unsigned long base,
+ void __iomem *base,
void (*reset_callback)(unsigned long data),
unsigned long reset_callback_data)
{
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 7d38641..e5015b0 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -1776,8 +1776,7 @@ static int __devinit omap24xxcam_probe(struct platform_device *pdev)
cam->mmio_size = resource_size(mem);
/* map the region */
- cam->mmio_base = (unsigned long)
- ioremap_nocache(cam->mmio_base_phys, cam->mmio_size);
+ cam->mmio_base = ioremap_nocache(cam->mmio_base_phys, cam->mmio_size);
if (!cam->mmio_base) {
dev_err(cam->dev, "cannot map camera register I/O region\n");
goto err;
diff --git a/drivers/media/video/omap24xxcam.h b/drivers/media/video/omap24xxcam.h
index 2ce67f5..d59727a 100644
--- a/drivers/media/video/omap24xxcam.h
+++ b/drivers/media/video/omap24xxcam.h
@@ -429,7 +429,7 @@ struct sgdma_state {
struct omap24xxcam_dma {
spinlock_t lock; /* Lock for the whole structure. */
- unsigned long base; /* base address for dma controller */
+ void __iomem *base; /* base address for dma controller */
/* While dma_stop!=0, an attempt to start a new DMA transfer will
* fail.
@@ -491,7 +491,7 @@ struct omap24xxcam_device {
/*** hardware resources ***/
unsigned int irq;
- unsigned long mmio_base;
+ void __iomem *mmio_base;
unsigned long mmio_base_phys;
unsigned long mmio_size;
@@ -544,22 +544,22 @@ struct omap24xxcam_fh {
*
*/
-static inline u32 omap24xxcam_reg_in(unsigned long base, u32 offset)
+static inline u32 omap24xxcam_reg_in(u32 __iomem *base, u32 offset)
{
return readl(base + offset);
}
-static inline u32 omap24xxcam_reg_out(unsigned long base, u32 offset,
+static inline u32 omap24xxcam_reg_out(u32 __iomem *base, u32 offset,
u32 val)
{
writel(val, base + offset);
return val;
}
-static inline u32 omap24xxcam_reg_merge(unsigned long base, u32 offset,
+static inline u32 omap24xxcam_reg_merge(u32 __iomem *base, u32 offset,
u32 val, u32 mask)
{
- u32 addr = base + offset;
+ u32 __iomem *addr = base + offset;
u32 new_val = (readl(addr) & ~mask) | (val & mask);
writel(new_val, addr);
@@ -585,7 +585,7 @@ int omap24xxcam_sgdma_queue(struct omap24xxcam_sgdma *sgdma,
int len, sgdma_callback_t callback, void *arg);
void omap24xxcam_sgdma_sync(struct omap24xxcam_sgdma *sgdma);
void omap24xxcam_sgdma_init(struct omap24xxcam_sgdma *sgdma,
- unsigned long base,
+ void __iomem *base,
void (*reset_callback)(unsigned long data),
unsigned long reset_callback_data);
void omap24xxcam_sgdma_exit(struct omap24xxcam_sgdma *sgdma);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread