diff options
| author | Steven Toth <stoth@kernellabs.com> | 2009-05-10 13:08:27 -0400 |
|---|---|---|
| committer | Steven Toth <stoth@kernellabs.com> | 2009-05-10 13:08:27 -0400 |
| commit | c891751cdfcce6b721ac482c5fa05e1b6ae26daf (patch) | |
| tree | 96e3b4812cbca10695c82fc812ed3b6279e950aa /linux/drivers/media/video/saa7164/saa7164-core.c | |
| parent | 855289ebd477cc340672af66c0a41a791868f0ea (diff) | |
| download | mediapointer-dvb-s2-c891751cdfcce6b721ac482c5fa05e1b6ae26daf.tar.gz mediapointer-dvb-s2-c891751cdfcce6b721ac482c5fa05e1b6ae26daf.tar.bz2 | |
SAA7164: Remove volatiles for PCI writes (coding style violation)
From: Steven Toth <stoth@kernellabs.com>
SAA7164: Remove volatiles for PCI writes (coding style violation)
Priority: normal
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Diffstat (limited to 'linux/drivers/media/video/saa7164/saa7164-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7164/saa7164-core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/saa7164/saa7164-core.c b/linux/drivers/media/video/saa7164/saa7164-core.c index 08cc13a32..716b82780 100644 --- a/linux/drivers/media/video/saa7164/saa7164-core.c +++ b/linux/drivers/media/video/saa7164/saa7164-core.c @@ -164,12 +164,13 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id) /* Check that the hardware is accessable. If the status bytes are * 0xFF then the device is not accessable, the the IRQ belongs * to another driver. + * 4 x u32 interrupt registers. */ for (i = 0; i < INT_SIZE/4; i++) { /* TODO: Convert into saa7164_readl() */ /* Read the 4 hardware interrupt registers */ - intstat[i] = *(dev->InterruptStatus + i); + intstat[i] = saa7164_readl(dev->int_status + (i * 4)); if (intstat[i] != 0xffffffff) hwacc = 1; @@ -222,9 +223,8 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id) } } - /* TODO: Convert into saa7164_writel() */ /* Ack it */ - *(dev->InterruptAck + i) = intstat[i]; + saa7164_writel(dev->int_ack + (i * 4), intstat[i]); } } @@ -525,9 +525,9 @@ static int saa7164_dev_setup(struct saa7164_dev *dev) printk(KERN_INFO "CORE %s: dev->bmmio2 = 0x%p\n", dev->name, dev->bmmio2); - /* TODO: Magic defines used in the windows driver, define these */ - dev->InterruptStatus = (u32 *)(dev->bmmio + 0x183000 + 0xf80); - dev->InterruptAck = (u32 *)(dev->bmmio + 0x183000 + 0xf90); + /* Inerrupt and ack register locations offset of bmmio */ + dev->int_status = 0x183000 + 0xf80; + dev->int_ack = 0x183000 + 0xf90; printk(KERN_INFO "CORE %s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n", |