8250_pci: coding style (5756ee99) · Commits · 戴 / test

drivers/serial/8250_pci.c

+54 −55

Original line number	Diff line number	Diff line
		@@ -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
		*/
		@@ -368,9 +366,9 @@ 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) {
		/* FIXME: What if resource_len < OCT_REG_CR_OFF */
		if (p != NULL)
		writeb(0, p + OCT_REG_CR_OFF);
		}
		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_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 */
		@@ -1863,7 +1862,7 @@ 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

		@@ -1873,9 +1872,7 @@ pciserial_init_ports(struct pci_dev dev, struct pciserial_board board)
		break;
		}
		}

		priv->nr = i;

		return priv;

		err_deinit:
		@@ -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 },

		/*

Admin message