tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

tty: serial: 8250: Fix whitespace errors

This patch fixes whitespace errors reported by checkpatch to increase
readability. Main focus is on missing spaces after commas in
function headers and macros (like foo,bar edited to foo, bar).

Signed-off-by: Anton Würfel <anton.wuerfel@fau.de>
Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-kernel@i4.cs.fau.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Anton Wuerfel and committed by
Greg Kroah-Hartman 1a33e342 fff21fac

+39 -35
+1 -1
drivers/tty/serial/8250/8250_acorn.c
··· 70 70 uart.port.regshift = 2; 71 71 uart.port.dev = &ec->dev; 72 72 73 - for (i = 0; i < info->num_ports; i ++) { 73 + for (i = 0; i < info->num_ports; i++) { 74 74 uart.port.membase = info->vaddr + type->offset[i]; 75 75 uart.port.mapbase = bus_addr + type->offset[i]; 76 76
+1 -1
drivers/tty/serial/8250/8250_hub6.c
··· 10 10 #include <linux/init.h> 11 11 #include <linux/serial_8250.h> 12 12 13 - #define HUB6(card,port) \ 13 + #define HUB6(card, port) \ 14 14 { \ 15 15 .iobase = 0x302, \ 16 16 .irq = 3, \
+5 -3
drivers/tty/serial/8250/8250_pci.c
··· 1198 1198 1199 1199 static int pci_quatech_test(struct uart_8250_port *port) 1200 1200 { 1201 - u8 reg; 1202 - u8 qopr = pci_quatech_rqopr(port); 1201 + u8 reg, qopr; 1202 + 1203 + qopr = pci_quatech_rqopr(port); 1203 1204 pci_quatech_wqopr(port, qopr & QPCR_TEST_FOR1); 1204 1205 reg = pci_quatech_rqopr(port) & 0xC0; 1205 1206 if (reg != QPCR_TEST_GET1) ··· 1287 1286 unsigned long base = pci_resource_start(dev, 0); 1288 1287 if (base) { 1289 1288 u32 tmp; 1289 + 1290 1290 outl(inl(base + 0x38) | 0x00002000, base + 0x38); 1291 1291 tmp = inl(base + 0x3c); 1292 1292 outl(tmp | 0x01000000, base + 0x3c); ··· 4489 4487 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4490 4488 pbn_b0_bt_2_921600 }, 4491 4489 { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958, 4492 - PCI_ANY_ID , PCI_ANY_ID, 0, 0, 4490 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4493 4491 pbn_b2_8_1152000 }, 4494 4492 4495 4493 /*
+2
drivers/tty/serial/8250/8250_port.c
··· 1503 1503 1504 1504 if (up->bugs & UART_BUG_TXEN) { 1505 1505 unsigned char lsr; 1506 + 1506 1507 lsr = serial_in(up, UART_LSR); 1507 1508 up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS; 1508 1509 if (lsr & UART_LSR_THRE) ··· 1964 1963 /* Wait up to 1s for flow control if necessary */ 1965 1964 if (up->port.flags & UPF_CONS_FLOW) { 1966 1965 unsigned int tmout; 1966 + 1967 1967 for (tmout = 1000000; tmout; tmout--) { 1968 1968 unsigned int msr = serial_in(up, UART_MSR); 1969 1969 up->msr_saved_flags |= msr & MSR_SAVE_FLAGS;
+30 -30
drivers/tty/serial/8250/serial_cs.c
··· 28 28 and other provisions required by the GPL. If you do not delete 29 29 the provisions above, a recipient may use your version of this 30 30 file under either the MPL or the GPL. 31 - 31 + 32 32 ======================================================================*/ 33 33 34 34 #include <linux/module.h> ··· 257 257 }; 258 258 259 259 260 - static int serial_config(struct pcmcia_device * link); 260 + static int serial_config(struct pcmcia_device *link); 261 261 262 262 263 263 static void serial_remove(struct pcmcia_device *link) ··· 309 309 dev_dbg(&link->dev, "serial_attach()\n"); 310 310 311 311 /* Create new serial device */ 312 - info = kzalloc(sizeof (*info), GFP_KERNEL); 312 + info = kzalloc(sizeof(*info), GFP_KERNEL); 313 313 if (!info) 314 314 return -ENOMEM; 315 315 info->p_dev = link; ··· 339 339 340 340 /*====================================================================*/ 341 341 342 - static int setup_serial(struct pcmcia_device *handle, struct serial_info * info, 342 + static int setup_serial(struct pcmcia_device *handle, struct serial_info *info, 343 343 unsigned int iobase, int irq) 344 344 { 345 345 struct uart_8250_port uart; ··· 600 600 } 601 601 602 602 603 - static int serial_config(struct pcmcia_device * link) 603 + static int serial_config(struct pcmcia_device *link) 604 604 { 605 605 struct serial_info *info = link->priv; 606 606 int i; ··· 701 701 PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58), 702 702 PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e), 703 703 PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555), 704 - PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064), 704 + PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001", 0x18df0ba0, 0x831b1064), 705 705 PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamonds Modem+Ethernet", 0xc2f80cd, 0x656947b9), 706 706 PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed), 707 707 PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc), ··· 797 797 PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"), 798 798 PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"), 799 799 PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis"), 800 - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b), 801 - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83), 802 - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232 1.00.",0x19ca78af,0x69fb7490), 803 - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232",0x19ca78af,0xb6bc0235), 804 - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232",0x63f2e0bd,0xb9e175d3), 805 - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232-5",0x63f2e0bd,0xfce33442), 806 - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232",0x3beb8cf2,0x171e7190), 807 - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232-5",0x3beb8cf2,0x20da4262), 808 - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF428",0x3beb8cf2,0xea5dd57d), 809 - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF500",0x3beb8cf2,0xd77255fa), 810 - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: IC232",0x3beb8cf2,0x6a709903), 811 - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: SL232",0x3beb8cf2,0x18430676), 812 - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: XL232",0x3beb8cf2,0x6f933767), 813 - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7), 814 - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41), 815 - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029), 816 - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4), 817 - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc), 818 - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7), 819 - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41), 820 - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029), 821 - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4), 822 - PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4), 823 - PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4), 800 + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL100 1.00.", 0x19ca78af, 0xf964f42b), 801 + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL100", 0x19ca78af, 0x71d98e83), 802 + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232 1.00.", 0x19ca78af, 0x69fb7490), 803 + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232", 0x19ca78af, 0xb6bc0235), 804 + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL CARD: CF232", 0x63f2e0bd, 0xb9e175d3), 805 + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL CARD: CF232-5", 0x63f2e0bd, 0xfce33442), 806 + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232", 0x3beb8cf2, 0x171e7190), 807 + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232-5", 0x3beb8cf2, 0x20da4262), 808 + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF428", 0x3beb8cf2, 0xea5dd57d), 809 + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF500", 0x3beb8cf2, 0xd77255fa), 810 + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: IC232", 0x3beb8cf2, 0x6a709903), 811 + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: SL232", 0x3beb8cf2, 0x18430676), 812 + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: XL232", 0x3beb8cf2, 0x6f933767), 813 + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: CF332", 0x3beb8cf2, 0x16dc1ba7), 814 + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL332", 0x3beb8cf2, 0x19816c41), 815 + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL385", 0x3beb8cf2, 0x64112029), 816 + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4), 817 + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial+Parallel Port: SP230", 0x3beb8cf2, 0xdb9e58bc), 818 + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: CF332", 0x3beb8cf2, 0x16dc1ba7), 819 + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL332", 0x3beb8cf2, 0x19816c41), 820 + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL385", 0x3beb8cf2, 0x64112029), 821 + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4), 822 + PCMCIA_MFC_DEVICE_PROD_ID12(2, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4), 823 + PCMCIA_MFC_DEVICE_PROD_ID12(3, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4), 824 824 PCMCIA_DEVICE_MANF_CARD(0x0279, 0x950b), 825 825 /* too generic */ 826 826 /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */