8250_pci: coding style
Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
3b0fd36ddc
commit
5756ee9996
|
@ -227,7 +227,7 @@ static int pci_inteli960ni_init(struct pci_dev *dev)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
/* is firmware started? */
|
/* is firmware started? */
|
||||||
pci_read_config_dword(dev, 0x44, (void*) &oldval);
|
pci_read_config_dword(dev, 0x44, (void *)&oldval);
|
||||||
if (oldval == 0x00001000L) { /* RESET value */
|
if (oldval == 0x00001000L) { /* RESET value */
|
||||||
printk(KERN_DEBUG "Local i960 firmware missing");
|
printk(KERN_DEBUG "Local i960 firmware missing");
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -253,11 +253,11 @@ static int pci_plx9050_init(struct pci_dev *dev)
|
||||||
|
|
||||||
irq_config = 0x41;
|
irq_config = 0x41;
|
||||||
if (dev->vendor == PCI_VENDOR_ID_PANACOM ||
|
if (dev->vendor == PCI_VENDOR_ID_PANACOM ||
|
||||||
dev->subsystem_vendor == PCI_SUBVENDOR_ID_EXSYS) {
|
dev->subsystem_vendor == PCI_SUBVENDOR_ID_EXSYS)
|
||||||
irq_config = 0x43;
|
irq_config = 0x43;
|
||||||
}
|
|
||||||
if ((dev->vendor == PCI_VENDOR_ID_PLX) &&
|
if ((dev->vendor == PCI_VENDOR_ID_PLX) &&
|
||||||
(dev->device == PCI_DEVICE_ID_PLX_ROMULUS)) {
|
(dev->device == PCI_DEVICE_ID_PLX_ROMULUS))
|
||||||
/*
|
/*
|
||||||
* As the megawolf cards have the int pins active
|
* As the megawolf cards have the int pins active
|
||||||
* high, and have 2 UART chips, both ints must be
|
* high, and have 2 UART chips, both ints must be
|
||||||
|
@ -267,8 +267,6 @@ static int pci_plx9050_init(struct pci_dev *dev)
|
||||||
* deep FIFOs
|
* deep FIFOs
|
||||||
*/
|
*/
|
||||||
irq_config = 0x5b;
|
irq_config = 0x5b;
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* enable/disable interrupts
|
* enable/disable interrupts
|
||||||
*/
|
*/
|
||||||
|
@ -343,14 +341,14 @@ static int sbs_init(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
u8 __iomem *p;
|
u8 __iomem *p;
|
||||||
|
|
||||||
p = ioremap(pci_resource_start(dev, 0),pci_resource_len(dev,0));
|
p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0));
|
||||||
|
|
||||||
if (p == NULL)
|
if (p == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
/* Set bit-4 Control Register (UART RESET) in to reset the uarts */
|
/* Set bit-4 Control Register (UART RESET) in to reset the uarts */
|
||||||
writeb(0x10,p + OCT_REG_CR_OFF);
|
writeb(0x10, p + OCT_REG_CR_OFF);
|
||||||
udelay(50);
|
udelay(50);
|
||||||
writeb(0x0,p + OCT_REG_CR_OFF);
|
writeb(0x0, p + OCT_REG_CR_OFF);
|
||||||
|
|
||||||
/* Set bit-2 (INTENABLE) of Control Register */
|
/* Set bit-2 (INTENABLE) of Control Register */
|
||||||
writeb(0x4, p + OCT_REG_CR_OFF);
|
writeb(0x4, p + OCT_REG_CR_OFF);
|
||||||
|
@ -367,10 +365,10 @@ static void __devexit sbs_exit(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
u8 __iomem *p;
|
u8 __iomem *p;
|
||||||
|
|
||||||
p = ioremap(pci_resource_start(dev, 0),pci_resource_len(dev,0));
|
p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0));
|
||||||
if (p != NULL) {
|
/* FIXME: What if resource_len < OCT_REG_CR_OFF */
|
||||||
|
if (p != NULL)
|
||||||
writeb(0, p + OCT_REG_CR_OFF);
|
writeb(0, p + OCT_REG_CR_OFF);
|
||||||
}
|
|
||||||
iounmap(p);
|
iounmap(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -656,7 +654,8 @@ static int pci_ite887x_init(struct pci_dev *dev)
|
||||||
ITE_887x_POSIO_ENABLE | ITE_887x_POSIO_SPEED |
|
ITE_887x_POSIO_ENABLE | ITE_887x_POSIO_SPEED |
|
||||||
ITE_887x_POSIO_IOSIZE_32 | inta_addr[i]);
|
ITE_887x_POSIO_IOSIZE_32 | inta_addr[i]);
|
||||||
/* write INTCBAR - ioport */
|
/* write INTCBAR - ioport */
|
||||||
pci_write_config_dword(dev, ITE_887x_INTCBAR, inta_addr[i]);
|
pci_write_config_dword(dev, ITE_887x_INTCBAR,
|
||||||
|
inta_addr[i]);
|
||||||
ret = inb(inta_addr[i]);
|
ret = inb(inta_addr[i]);
|
||||||
if (ret != 0xff) {
|
if (ret != 0xff) {
|
||||||
/* ioport connected */
|
/* ioport connected */
|
||||||
|
@ -1711,7 +1710,7 @@ static struct pciserial_board pci_boards[] __devinitdata = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct pci_device_id softmodem_blacklist[] = {
|
static const struct pci_device_id softmodem_blacklist[] = {
|
||||||
{ PCI_VDEVICE ( AL, 0x5457 ), }, /* ALi Corporation M5457 AC'97 Modem */
|
{ PCI_VDEVICE(AL, 0x5457), }, /* ALi Corporation M5457 AC'97 Modem */
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1863,7 +1862,7 @@ pciserial_init_ports(struct pci_dev *dev, struct pciserial_board *board)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef SERIAL_DEBUG_PCI
|
#ifdef SERIAL_DEBUG_PCI
|
||||||
printk("Setup PCI port: port %x, irq %d, type %d\n",
|
printk(KERN_DEBUG "Setup PCI port: port %x, irq %d, type %d\n",
|
||||||
serial_port.iobase, serial_port.irq, serial_port.iotype);
|
serial_port.iobase, serial_port.irq, serial_port.iotype);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1873,15 +1872,13 @@ pciserial_init_ports(struct pci_dev *dev, struct pciserial_board *board)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
priv->nr = i;
|
priv->nr = i;
|
||||||
|
|
||||||
return priv;
|
return priv;
|
||||||
|
|
||||||
err_deinit:
|
err_deinit:
|
||||||
if (quirk->exit)
|
if (quirk->exit)
|
||||||
quirk->exit(dev);
|
quirk->exit(dev);
|
||||||
err_out:
|
err_out:
|
||||||
return priv;
|
return priv;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(pciserial_init_ports);
|
EXPORT_SYMBOL_GPL(pciserial_init_ports);
|
||||||
|
@ -2269,10 +2266,12 @@ static struct pci_device_id serial_pci_tbl[] = {
|
||||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
pbn_b1_8_115200 },
|
pbn_b1_8_115200 },
|
||||||
{ PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_OXSEMI_16PCI954,
|
{ PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_OXSEMI_16PCI954,
|
||||||
PCI_VENDOR_ID_SPECIALIX, PCI_SUBDEVICE_ID_SPECIALIX_SPEED4, 0, 0,
|
PCI_VENDOR_ID_SPECIALIX, PCI_SUBDEVICE_ID_SPECIALIX_SPEED4,
|
||||||
|
0, 0,
|
||||||
pbn_b0_4_921600 },
|
pbn_b0_4_921600 },
|
||||||
{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
|
{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
|
||||||
PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL, 0, 0,
|
PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL,
|
||||||
|
0, 0,
|
||||||
pbn_b0_4_1152000 },
|
pbn_b0_4_1152000 },
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue