forked from Minki/linux
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:
Alan Cox
Linus Torvalds
parent
3b0fd36ddc
commit
5756ee9996
@ -140,7 +140,7 @@ afavlab_setup(struct serial_private *priv, struct pciserial_board *board,
|
||||
struct uart_port *port, int idx)
|
||||
{
|
||||
unsigned int bar, offset = board->first_offset;
|
||||
|
||||
|
||||
bar = FL_GET_BASE(board->flags);
|
||||
if (idx < 4)
|
||||
bar += idx;
|
||||
@ -227,8 +227,8 @@ static int pci_inteli960ni_init(struct pci_dev *dev)
|
||||
return -ENODEV;
|
||||
|
||||
/* is firmware started? */
|
||||
pci_read_config_dword(dev, 0x44, (void*) &oldval);
|
||||
if (oldval == 0x00001000L) { /* RESET value */
|
||||
pci_read_config_dword(dev, 0x44, (void *)&oldval);
|
||||
if (oldval == 0x00001000L) { /* RESET value */
|
||||
printk(KERN_DEBUG "Local i960 firmware missing");
|
||||
return -ENODEV;
|
||||
}
|
||||
@ -253,11 +253,11 @@ static int pci_plx9050_init(struct pci_dev *dev)
|
||||
|
||||
irq_config = 0x41;
|
||||
if (dev->vendor == PCI_VENDOR_ID_PANACOM ||
|
||||
dev->subsystem_vendor == PCI_SUBVENDOR_ID_EXSYS) {
|
||||
dev->subsystem_vendor == PCI_SUBVENDOR_ID_EXSYS)
|
||||
irq_config = 0x43;
|
||||
}
|
||||
|
||||
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
|
||||
* 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
|
||||
*/
|
||||
irq_config = 0x5b;
|
||||
}
|
||||
|
||||
/*
|
||||
* enable/disable interrupts
|
||||
*/
|
||||
@ -343,14 +341,14 @@ static int sbs_init(struct pci_dev *dev)
|
||||
{
|
||||
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)
|
||||
return -ENOMEM;
|
||||
/* 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);
|
||||
writeb(0x0,p + OCT_REG_CR_OFF);
|
||||
writeb(0x0, p + OCT_REG_CR_OFF);
|
||||
|
||||
/* Set bit-2 (INTENABLE) of Control Register */
|
||||
writeb(0x4, p + OCT_REG_CR_OFF);
|
||||
@ -367,10 +365,10 @@ static void __devexit sbs_exit(struct pci_dev *dev)
|
||||
{
|
||||
u8 __iomem *p;
|
||||
|
||||
p = ioremap(pci_resource_start(dev, 0),pci_resource_len(dev,0));
|
||||
if (p != NULL) {
|
||||
p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0));
|
||||
/* FIXME: What if resource_len < OCT_REG_CR_OFF */
|
||||
if (p != NULL)
|
||||
writeb(0, p + OCT_REG_CR_OFF);
|
||||
}
|
||||
iounmap(p);
|
||||
}
|
||||
|
||||
@ -386,7 +384,7 @@ static void __devexit sbs_exit(struct pci_dev *dev)
|
||||
* with other OSes (like M$ DOS).
|
||||
*
|
||||
* SIIG support added by Andrey Panin <pazke@donpac.ru>, 10/1999
|
||||
*
|
||||
*
|
||||
* There is two family of SIIG serial cards with different PCI
|
||||
* interface chip and different configuration methods:
|
||||
* - 10x cards have control registers in IO and/or memory space;
|
||||
@ -489,21 +487,21 @@ static const unsigned short timedia_single_port[] = {
|
||||
|
||||
static const unsigned short timedia_dual_port[] = {
|
||||
0x0002, 0x4036, 0x4037, 0x4038, 0x4078, 0x4079, 0x4085,
|
||||
0x4088, 0x4089, 0x5037, 0x5078, 0x5079, 0x5085, 0x6079,
|
||||
0x7079, 0x8079, 0x8137, 0x8138, 0x8237, 0x8238, 0x9079,
|
||||
0x4088, 0x4089, 0x5037, 0x5078, 0x5079, 0x5085, 0x6079,
|
||||
0x7079, 0x8079, 0x8137, 0x8138, 0x8237, 0x8238, 0x9079,
|
||||
0x9137, 0x9138, 0x9237, 0x9238, 0xA079, 0xB079, 0xC079,
|
||||
0xD079, 0
|
||||
};
|
||||
|
||||
static const unsigned short timedia_quad_port[] = {
|
||||
0x4055, 0x4056, 0x4095, 0x4096, 0x5056, 0x8156, 0x8157,
|
||||
0x8256, 0x8257, 0x9056, 0x9156, 0x9157, 0x9158, 0x9159,
|
||||
0x4055, 0x4056, 0x4095, 0x4096, 0x5056, 0x8156, 0x8157,
|
||||
0x8256, 0x8257, 0x9056, 0x9156, 0x9157, 0x9158, 0x9159,
|
||||
0x9256, 0x9257, 0xA056, 0xA157, 0xA158, 0xA159, 0xB056,
|
||||
0xB157, 0
|
||||
};
|
||||
|
||||
static const unsigned short timedia_eight_port[] = {
|
||||
0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166,
|
||||
0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166,
|
||||
0x9167, 0x9168, 0xA066, 0xA167, 0xA168, 0
|
||||
};
|
||||
|
||||
@ -656,7 +654,8 @@ static int pci_ite887x_init(struct pci_dev *dev)
|
||||
ITE_887x_POSIO_ENABLE | ITE_887x_POSIO_SPEED |
|
||||
ITE_887x_POSIO_IOSIZE_32 | inta_addr[i]);
|
||||
/* 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]);
|
||||
if (ret != 0xff) {
|
||||
/* ioport connected */
|
||||
@ -755,7 +754,7 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
|
||||
|
||||
if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
|
||||
return 1;
|
||||
|
||||
|
||||
return setup_port(priv, port, bar, offset, board->reg_shift);
|
||||
}
|
||||
|
||||
@ -843,7 +842,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
|
||||
.init = pci_plx9050_init,
|
||||
.setup = pci_default_setup,
|
||||
.exit = __devexit_p(pci_plx9050_exit),
|
||||
},
|
||||
},
|
||||
{
|
||||
.vendor = PCI_VENDOR_ID_PANACOM,
|
||||
.device = PCI_DEVICE_ID_PANACOM_DUALMODEM,
|
||||
@ -1032,7 +1031,7 @@ static struct pci_serial_quirk *find_quirk(struct pci_dev *dev)
|
||||
quirk_id_matches(quirk->device, dev->device) &&
|
||||
quirk_id_matches(quirk->subvendor, dev->subsystem_vendor) &&
|
||||
quirk_id_matches(quirk->subdevice, dev->subsystem_device))
|
||||
break;
|
||||
break;
|
||||
return quirk;
|
||||
}
|
||||
|
||||
@ -1711,7 +1710,7 @@ static struct pciserial_board pci_boards[] __devinitdata = {
|
||||
};
|
||||
|
||||
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 */
|
||||
};
|
||||
|
||||
/*
|
||||
@ -1724,13 +1723,13 @@ serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)
|
||||
{
|
||||
const struct pci_device_id *blacklist;
|
||||
int num_iomem, num_port, first_port = -1, i;
|
||||
|
||||
|
||||
/*
|
||||
* If it is not a communications device or the programming
|
||||
* interface is greater than 6, give up.
|
||||
*
|
||||
* (Should we try to make guesses for multiport serial devices
|
||||
* later?)
|
||||
* later?)
|
||||
*/
|
||||
if ((((dev->class >> 8) != PCI_CLASS_COMMUNICATION_SERIAL) &&
|
||||
((dev->class >> 8) != PCI_CLASS_COMMUNICATION_MODEM)) ||
|
||||
@ -1863,25 +1862,23 @@ pciserial_init_ports(struct pci_dev *dev, struct pciserial_board *board)
|
||||
break;
|
||||
|
||||
#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);
|
||||
#endif
|
||||
|
||||
|
||||
priv->line[i] = serial8250_register_port(&serial_port);
|
||||
if (priv->line[i] < 0) {
|
||||
printk(KERN_WARNING "Couldn't register serial port %s: %d\n", pci_name(dev), priv->line[i]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
priv->nr = i;
|
||||
|
||||
return priv;
|
||||
|
||||
err_deinit:
|
||||
err_deinit:
|
||||
if (quirk->exit)
|
||||
quirk->exit(dev);
|
||||
err_out:
|
||||
err_out:
|
||||
return priv;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(pciserial_init_ports);
|
||||
@ -2171,22 +2168,22 @@ static struct pci_device_id serial_pci_tbl[] = {
|
||||
pbn_b0_8_1843200_200 },
|
||||
|
||||
{ PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_U530,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_bt_1_115200 },
|
||||
{ PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM2,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_bt_2_115200 },
|
||||
{ PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM422,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_bt_4_115200 },
|
||||
{ PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM232,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_bt_2_115200 },
|
||||
{ PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_COMM4,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_bt_4_115200 },
|
||||
{ PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_COMM8,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_8_115200 },
|
||||
{ PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM8,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
@ -2201,11 +2198,11 @@ static struct pci_device_id serial_pci_tbl[] = {
|
||||
/*
|
||||
* VScom SPCOM800, from sl@s.pl
|
||||
*/
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_SPCOM800,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_SPCOM800,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_8_921600 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_1077,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_4_921600 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
|
||||
PCI_SUBVENDOR_ID_KEYSPAN,
|
||||
@ -2223,27 +2220,27 @@ static struct pci_device_id serial_pci_tbl[] = {
|
||||
pbn_b2_4_115200 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
|
||||
PCI_SUBVENDOR_ID_CHASE_PCIFAST,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIFAST4, 0, 0,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIFAST4, 0, 0,
|
||||
pbn_b2_4_460800 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
|
||||
PCI_SUBVENDOR_ID_CHASE_PCIFAST,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIFAST8, 0, 0,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIFAST8, 0, 0,
|
||||
pbn_b2_8_460800 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
|
||||
PCI_SUBVENDOR_ID_CHASE_PCIFAST,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIFAST16, 0, 0,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIFAST16, 0, 0,
|
||||
pbn_b2_16_460800 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
|
||||
PCI_SUBVENDOR_ID_CHASE_PCIFAST,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIFAST16FMC, 0, 0,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIFAST16FMC, 0, 0,
|
||||
pbn_b2_16_460800 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
|
||||
PCI_SUBVENDOR_ID_CHASE_PCIRAS,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIRAS4, 0, 0,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIRAS4, 0, 0,
|
||||
pbn_b2_4_460800 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
|
||||
PCI_SUBVENDOR_ID_CHASE_PCIRAS,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIRAS8, 0, 0,
|
||||
PCI_SUBDEVICE_ID_CHASE_PCIRAS8, 0, 0,
|
||||
pbn_b2_8_460800 },
|
||||
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
|
||||
PCI_SUBVENDOR_ID_EXSYS,
|
||||
@ -2269,10 +2266,12 @@ static struct pci_device_id serial_pci_tbl[] = {
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b1_8_115200 },
|
||||
{ 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 },
|
||||
{ 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 },
|
||||
|
||||
/*
|
||||
@ -2312,7 +2311,7 @@ static struct pci_device_id serial_pci_tbl[] = {
|
||||
* Digitan DS560-558, from jimd@esoft.com
|
||||
*/
|
||||
{ PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_ATT_VENUS_MODEM,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b1_1_115200 },
|
||||
|
||||
/*
|
||||
@ -2320,16 +2319,16 @@ static struct pci_device_id serial_pci_tbl[] = {
|
||||
* The 400L and 800L have a custom setup quirk.
|
||||
*/
|
||||
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b0_1_921600 },
|
||||
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b0_2_921600 },
|
||||
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b0_4_921600 },
|
||||
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800B,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b0_4_921600 },
|
||||
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100L,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user