mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

V4L/DVB (12927): SAA7164: Remove volatiles for PCI writes (coding style violation)

Browse source 
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth 2009-05-10 14:08:27 -03:00 committed by Mauro Carvalho Chehab
parent 9d119c3314
commit 1a6450d4d4
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/video/saa7164/saa7164-bus.c
View file

@ -257,7 +257,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf)
dprintk(DBGLVL_BUS, "%s() new_swp = %x\n", __func__, new_swp);
/* TODO: Convert all of the volatiles and direct PCI writes into
/* TODO: Convert all of the direct PCI writes into
* saa7164_writel/b calls for consistency.
*/

12
drivers/media/video/saa7164/saa7164-core.c
View file

@ -126,12 +126,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;
@ -184,9 +185,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]);
}
}
@ -487,9 +487,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",

6
drivers/media/video/saa7164/saa7164.h
View file

@ -274,9 +274,9 @@ struct saa7164_dev {
tmComResBusInfo_t bus;
/* TODO: Urgh, remove volatiles */
volatile u32 *InterruptStatus;
volatile u32 *InterruptAck;
/* Interrupt status and ack registers */
u32 int_status;
u32 int_ack;
struct cmd cmds[SAA_CMD_MAX_MSG_UNITS];
struct mutex lock;