diff mbox

[v4,01/13] tty: serial: 8250: Fix whitespace errors

Message ID 1452275039-18787-2-git-send-email-anton.wuerfel@fau.de (mailing list archive)
State Awaiting Upstream
Headers show

Commit Message

Anton Wuerfel Jan. 8, 2016, 5:43 p.m. UTC
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>
CC: linux-kernel@i4.cs.fau.de
---
 drivers/tty/serial/8250/8250_accent.c        |  2 +-
 drivers/tty/serial/8250/8250_acorn.c         |  2 +-
 drivers/tty/serial/8250/8250_boca.c          |  2 +-
 drivers/tty/serial/8250/8250_exar_st16c554.c |  2 +-
 drivers/tty/serial/8250/8250_fourport.c      |  2 +-
 drivers/tty/serial/8250/8250_hub6.c          |  2 +-
 drivers/tty/serial/8250/8250_pci.c           | 10 +++--
 drivers/tty/serial/8250/8250_port.c          |  2 +
 drivers/tty/serial/8250/serial_cs.c          | 60 ++++++++++++++--------------
 9 files changed, 44 insertions(+), 40 deletions(-)

Comments

Andy Shevchenko Jan. 11, 2016, 12:28 p.m. UTC | #1
On Fri, 2016-01-08 at 18:43 +0100, Anton Wuerfel wrote:
> 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>
> CC: linux-kernel@i4.cs.fau.de

Cc: looks more standard.

> --- a/drivers/tty/serial/8250/8250_accent.c
> +++ b/drivers/tty/serial/8250/8250_accent.c
> @@ -10,7 +10,7 @@
>  #include <linux/init.h>
>  #include <linux/serial_8250.h>
>  
> -#define PORT(_base,_irq)				\
> +#define PORT(_base, _irq)				\
>  	{						\
>  		.iobase		= _base,		\
>  		.irq		= _irq,			\
> 

While those are okay, I would suggest to make a macro in
drivers/…/8250.h one for all, something like this:

#define 8250_PORT_FLAGS(_base, _irq, _flags)
…
	.flags          = UPF_BOOT_AUTOCONF | (_flags) \

#define 8250_PORT(_base, _irq)	8250_PORT_FLAGS(_base, _irq, 0)

And use it.

> --- a/drivers/tty/serial/8250/8250_boca.c
> +++ b/drivers/tty/serial/8250/8250_boca.c
> @@ -10,7 +10,7 @@
>  #include <linux/init.h>
>  #include <linux/serial_8250.h>
>  
> -#define PORT(_base,_irq)				\
> +#define PORT(_base, _irq)				\
>  	{						\
>  		.iobase		= _base,		\
>  		.irq		= _irq,			\
> 

> --- a/drivers/tty/serial/8250/8250_exar_st16c554.c
> +++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
> @@ -13,7 +13,7 @@
>  #include <linux/init.h>
>  #include <linux/serial_8250.h>
>  
> -#define PORT(_base,_irq)				\
> +#define PORT(_base, _irq)				\
>  	{						\
>  		.iobase		= _base,		\
>  		.irq		= _irq,			\
> 

> --- a/drivers/tty/serial/8250/8250_fourport.c
> +++ b/drivers/tty/serial/8250/8250_fourport.c
> @@ -10,7 +10,7 @@
>  #include <linux/init.h>
>  #include <linux/serial_8250.h>
>  
> -#define PORT(_base,_irq)						
> \
> +#define PORT(_base, _irq)						
> \
>  	{								
> \
>  		.iobase		= _base,			
> 	\
>  		.irq		= _irq,				
> 	\
Andy Shevchenko Jan. 11, 2016, 12:50 p.m. UTC | #2
T24gTW9uLCAyMDE2LTAxLTExIGF0IDE0OjI4ICswMjAwLCBBbmR5IFNoZXZjaGVua28gd3JvdGU6
DQo+IE9uIEZyaSwgMjAxNi0wMS0wOCBhdCAxODo0MyArMDEwMCwgQW50b24gV3VlcmZlbCB3cm90
ZToNCj4gPiBUaGlzIHBhdGNoIGZpeGVzIHdoaXRlc3BhY2UgZXJyb3JzIHJlcG9ydGVkIGJ5IGNo
ZWNrcGF0Y2ggdG8NCj4gPiBpbmNyZWFzZQ0KPiA+IHJlYWRhYmlsaXR5LiBNYWluIGZvY3VzIGlz
IG9uIG1pc3Npbmcgc3BhY2VzIGFmdGVyIGNvbW1hcyBpbg0KPiA+IGZ1bmN0aW9uIGhlYWRlcnMg
YW5kIG1hY3JvcyAobGlrZSBmb28sYmFyIGVkaXRlZCB0byBmb28sIGJhcikuDQo+ID4gDQo+ID4g
U2lnbmVkLW9mZi1ieTogQW50b24gV8O8cmZlbCA8YW50b24ud3VlcmZlbEBmYXUuZGU+DQo+ID4g
U2lnbmVkLW9mZi1ieTogUGhpbGxpcCBSYWZmZWNrIDxwaGlsbGlwLnJhZmZlY2tAZmF1LmRlPg0K
PiA+IENDOiBsaW51eC1rZXJuZWxAaTQuY3MuZmF1LmRlDQo+IA0KPiBDYzogbG9va3MgbW9yZSBz
dGFuZGFyZC4NCj4gDQo+ID4gLS0tIGEvZHJpdmVycy90dHkvc2VyaWFsLzgyNTAvODI1MF9hY2Nl
bnQuYw0KPiA+ICsrKyBiL2RyaXZlcnMvdHR5L3NlcmlhbC84MjUwLzgyNTBfYWNjZW50LmMNCj4g
PiBAQCAtMTAsNyArMTAsNyBAQA0KPiA+IMKgI2luY2x1ZGUgPGxpbnV4L2luaXQuaD4NCj4gPiDC
oCNpbmNsdWRlIDxsaW51eC9zZXJpYWxfODI1MC5oPg0KPiA+IMKgDQo+ID4gLSNkZWZpbmUgUE9S
VChfYmFzZSxfaXJxKQkJCQlcDQo+ID4gKyNkZWZpbmUgUE9SVChfYmFzZSwgX2lycSkJCQkJXA0K
PiA+IMKgCXsJCQkJCQlcDQo+ID4gwqAJCS5pb2Jhc2UJCT0gX2Jhc2UsCQlcDQo+ID4gwqAJCS5p
cnEJCT0gX2lycSwJCQkNCj4gPiBcDQoNCjgyNTBfUE9SVCgpDQoNCj4gPiANCj4gDQo+IFdoaWxl
IHRob3NlIGFyZSBva2F5LCBJIHdvdWxkIHN1Z2dlc3QgdG8gbWFrZSBhIG1hY3JvIGluDQo+IGRy
aXZlcnMv4oCmLzgyNTAuaCBvbmUgZm9yIGFsbCwgc29tZXRoaW5nIGxpa2UgdGhpczoNCj4gDQo+
ICNkZWZpbmUgODI1MF9QT1JUX0ZMQUdTKF9iYXNlLCBfaXJxLCBfZmxhZ3MpDQo+IOKApg0KPiAJ
LmZsYWdzwqDCoMKgwqDCoMKgwqDCoMKgwqA9IFVQRl9CT09UX0FVVE9DT05GIHwgKF9mbGFncykg
XA0KPiANCj4gI2RlZmluZSA4MjUwX1BPUlQoX2Jhc2UsIF9pcnEpCTgyNTBfUE9SVF9GTEFHUyhf
YmFzZSwgX2lycSwgMCkNCj4gDQo+IEFuZCB1c2UgaXQuDQoNCiNkZWZpbmUgODI1MF9GT1VSUE9S
VChfYmFzZSwgX2lycSkJODI1MF9QT1JUX0ZMQUdTKF9iYXNlLCBfaXJxLA0KVVBGX0ZPVVJQT1JU
KQ0KDQo+ID4gLS0tIGEvZHJpdmVycy90dHkvc2VyaWFsLzgyNTAvODI1MF9mb3VycG9ydC5jDQo+
ID4gKysrIGIvZHJpdmVycy90dHkvc2VyaWFsLzgyNTAvODI1MF9mb3VycG9ydC5jDQo+ID4gQEAg
LTEwLDcgKzEwLDcgQEANCj4gPiDCoCNpbmNsdWRlIDxsaW51eC9pbml0Lmg+DQo+ID4gwqAjaW5j
bHVkZSA8bGludXgvc2VyaWFsXzgyNTAuaD4NCj4gPiDCoA0KPiA+IC0jZGVmaW5lIFBPUlQoX2Jh
c2UsX2lycSkJCQkJCQkNCj4gPiBcDQo+ID4gKyNkZWZpbmUgUE9SVChfYmFzZSwgX2lycSkJCQkJ
CQkNCj4gPiBcDQo+ID4gwqAJewkJCQkJCQkJDQo+ID4gXA0KPiA+IMKgCQkuaW9iYXNlCQk9IF9i
YXNlLAkJCQ0KPiA+IAlcDQo+ID4gwqAJCS5pcnEJCT0gX2lycSwJCQkNCj4gPiAJDQo+ID4gCVwN
Cg0KODI1MF9GT1VSUE9SVCgpDQoNCi0tIA0KQW5keSBTaGV2Y2hlbmtvIDxhbmRyaXkuc2hldmNo
ZW5rb0BpbnRlbC5jb20+DQpJbnRlbCBGaW5sYW5kIE95DQotLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KSW50ZWwgRmlu
bGFuZCBPeQpSZWdpc3RlcmVkIEFkZHJlc3M6IFBMIDI4MSwgMDAxODEgSGVsc2lua2kgCkJ1c2lu
ZXNzIElkZW50aXR5IENvZGU6IDAzNTc2MDYgLSA0IApEb21pY2lsZWQgaW4gSGVsc2lua2kgCgpU
aGlzIGUtbWFpbCBhbmQgYW55IGF0dGFjaG1lbnRzIG1heSBjb250YWluIGNvbmZpZGVudGlhbCBt
YXRlcmlhbCBmb3IKdGhlIHNvbGUgdXNlIG9mIHRoZSBpbnRlbmRlZCByZWNpcGllbnQocykuIEFu
eSByZXZpZXcgb3IgZGlzdHJpYnV0aW9uCmJ5IG90aGVycyBpcyBzdHJpY3RseSBwcm9oaWJpdGVk
LiBJZiB5b3UgYXJlIG5vdCB0aGUgaW50ZW5kZWQKcmVjaXBpZW50LCBwbGVhc2UgY29udGFjdCB0
aGUgc2VuZGVyIGFuZCBkZWxldGUgYWxsIGNvcGllcy4K

--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Måns Rullgård Jan. 11, 2016, 12:54 p.m. UTC | #3
"Shevchenko, Andriy" <andriy.shevchenko@intel.com> writes:

> On Mon, 2016-01-11 at 14:28 +0200, Andy Shevchenko wrote:
>> On Fri, 2016-01-08 at 18:43 +0100, Anton Wuerfel wrote:
>> > 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>
>> > CC: linux-kernel@i4.cs.fau.de
>> 
>> Cc: looks more standard.
>> 
>> > --- a/drivers/tty/serial/8250/8250_accent.c
>> > +++ b/drivers/tty/serial/8250/8250_accent.c
>> > @@ -10,7 +10,7 @@
>> >  #include <linux/init.h>
>> >  #include <linux/serial_8250.h>
>> >  
>> > -#define PORT(_base,_irq)				\
>> > +#define PORT(_base, _irq)				\
>> >  	{						\
>> >  		.iobase		= _base,		\
>> >  		.irq		= _irq,			
>> > \
>
> 8250_PORT()
>
>> > 
>> 
>> While those are okay, I would suggest to make a macro in
>> drivers/…/8250.h one for all, something like this:
>> 
>> #define 8250_PORT_FLAGS(_base, _irq, _flags)
>> …
>> 	.flags          = UPF_BOOT_AUTOCONF | (_flags) \
>> 
>> #define 8250_PORT(_base, _irq)	8250_PORT_FLAGS(_base, _irq, 0)
>> 
>> And use it.
>
> #define 8250_FOURPORT(_base, _irq)	8250_PORT_FLAGS(_base, _irq,
> UPF_FOURPORT)

Macro names can't start with a number.
Andy Shevchenko Jan. 11, 2016, 1:03 p.m. UTC | #4
On Mon, 2016-01-11 at 12:54 +0000, Måns Rullgård wrote:
> "Shevchenko, Andriy" <andriy.shevchenko@intel.com> writes:

> 

> > On Mon, 2016-01-11 at 14:28 +0200, Andy Shevchenko wrote:

> > > On Fri, 2016-01-08 at 18:43 +0100, Anton Wuerfel wrote:

> > > > 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>

> > > > CC: linux-kernel@i4.cs.fau.de

> > > 

> > > Cc: looks more standard.

> > > 

> > > > --- a/drivers/tty/serial/8250/8250_accent.c

> > > > +++ b/drivers/tty/serial/8250/8250_accent.c

> > > > @@ -10,7 +10,7 @@

> > > >  #include <linux/init.h>

> > > >  #include <linux/serial_8250.h>

> > > >  

> > > > -#define PORT(_base,_irq)				\

> > > > +#define PORT(_base, _irq)				\

> > > >  	{						\

> > > >  		.iobase		= _base,		

> > > > \

> > > >  		.irq		= _irq,			

> > > > \

> > 

> > 8250_PORT()

> > 

> > > > 

> > > 

> > > While those are okay, I would suggest to make a macro in

> > > drivers/…/8250.h one for all, something like this:

> > > 

> > > #define 8250_PORT_FLAGS(_base, _irq, _flags)

> > > …

> > > 	.flags          = UPF_BOOT_AUTOCONF | (_flags) \

> > > 

> > > #define 8250_PORT(_base, _irq)	8250_PORT_FLAGS(_base,

> > > _irq, 0)

> > > 

> > > And use it.

> > 

> > #define 8250_FOURPORT(_base, _irq)	8250_PORT_FLAGS(_base,

> > _irq,

> > UPF_FOURPORT)

> 

> Macro names can't start with a number.


Oh, right, thanks.

SERIAL8250_PORT* will work.

-- 
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki 
Business Identity Code: 0357606 - 4 
Domiciled in Helsinki 

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
diff mbox

Patch

diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c
index 34b51c6..c480729 100644
--- a/drivers/tty/serial/8250/8250_accent.c
+++ b/drivers/tty/serial/8250/8250_accent.c
@@ -10,7 +10,7 @@ 
 #include <linux/init.h>
 #include <linux/serial_8250.h>
 
-#define PORT(_base,_irq)				\
+#define PORT(_base, _irq)				\
 	{						\
 		.iobase		= _base,		\
 		.irq		= _irq,			\
diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
index 549aa07..402dfdd 100644
--- a/drivers/tty/serial/8250/8250_acorn.c
+++ b/drivers/tty/serial/8250/8250_acorn.c
@@ -70,7 +70,7 @@  serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
 	uart.port.regshift	= 2;
 	uart.port.dev	= &ec->dev;
 
-	for (i = 0; i < info->num_ports; i ++) {
+	for (i = 0; i < info->num_ports; i++) {
 		uart.port.membase = info->vaddr + type->offset[i];
 		uart.port.mapbase = bus_addr + type->offset[i];
 
diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c
index d125dc1..e42a5b5 100644
--- a/drivers/tty/serial/8250/8250_boca.c
+++ b/drivers/tty/serial/8250/8250_boca.c
@@ -10,7 +10,7 @@ 
 #include <linux/init.h>
 #include <linux/serial_8250.h>
 
-#define PORT(_base,_irq)				\
+#define PORT(_base, _irq)				\
 	{						\
 		.iobase		= _base,		\
 		.irq		= _irq,			\
diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
index bf53aab..999f2d3 100644
--- a/drivers/tty/serial/8250/8250_exar_st16c554.c
+++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
@@ -13,7 +13,7 @@ 
 #include <linux/init.h>
 #include <linux/serial_8250.h>
 
-#define PORT(_base,_irq)				\
+#define PORT(_base, _irq)				\
 	{						\
 		.iobase		= _base,		\
 		.irq		= _irq,			\
diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c
index be15826..9a04a8a 100644
--- a/drivers/tty/serial/8250/8250_fourport.c
+++ b/drivers/tty/serial/8250/8250_fourport.c
@@ -10,7 +10,7 @@ 
 #include <linux/init.h>
 #include <linux/serial_8250.h>
 
-#define PORT(_base,_irq)						\
+#define PORT(_base, _irq)						\
 	{								\
 		.iobase		= _base,				\
 		.irq		= _irq,					\
diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c
index a5c778e..27124e2 100644
--- a/drivers/tty/serial/8250/8250_hub6.c
+++ b/drivers/tty/serial/8250/8250_hub6.c
@@ -10,7 +10,7 @@ 
 #include <linux/init.h>
 #include <linux/serial_8250.h>
 
-#define HUB6(card,port)							\
+#define HUB6(card, port)						\
 	{								\
 		.iobase		= 0x302,				\
 		.irq		= 3,					\
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 4097f3f..ccf43cb 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -850,7 +850,7 @@  static int pci_netmos_init(struct pci_dev *dev)
 			break;
 
 		default:
-			if (num_serial == 0 ) {
+			if (num_serial == 0) {
 				moan_device("unknown NetMos/Mostech device", dev);
 			}
 	}
@@ -1198,8 +1198,9 @@  static int pci_quatech_has_qmcr(struct uart_8250_port *port)
 
 static int pci_quatech_test(struct uart_8250_port *port)
 {
-	u8 reg;
-	u8 qopr = pci_quatech_rqopr(port);
+	u8 reg, qopr;
+
+	qopr = pci_quatech_rqopr(port);
 	pci_quatech_wqopr(port, qopr & QPCR_TEST_FOR1);
 	reg = pci_quatech_rqopr(port) & 0xC0;
 	if (reg != QPCR_TEST_GET1)
@@ -1286,6 +1287,7 @@  static int pci_quatech_init(struct pci_dev *dev)
 		unsigned long base = pci_resource_start(dev, 0);
 		if (base) {
 			u32 tmp;
+
 			outl(inl(base + 0x38) | 0x00002000, base + 0x38);
 			tmp = inl(base + 0x3c);
 			outl(tmp | 0x01000000, base + 0x3c);
@@ -4502,7 +4504,7 @@  static struct pci_device_id serial_pci_tbl[] = {
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 		pbn_b0_bt_2_921600 },
 	{	PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958,
-		PCI_ANY_ID , PCI_ANY_ID, 0, 0,
+		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 		pbn_b2_8_1152000 },
 
 	/*
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 52d82d2..7f3bd7b 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1327,6 +1327,7 @@  static void serial8250_start_tx(struct uart_port *port)
 
 		if (up->bugs & UART_BUG_TXEN) {
 			unsigned char lsr;
+
 			lsr = serial_in(up, UART_LSR);
 			up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
 			if (lsr & UART_LSR_THRE)
@@ -1734,6 +1735,7 @@  static void wait_for_xmitr(struct uart_8250_port *up, int bits)
 	/* Wait up to 1s for flow control if necessary */
 	if (up->port.flags & UPF_CONS_FLOW) {
 		unsigned int tmout;
+
 		for (tmout = 1000000; tmout; tmout--) {
 			unsigned int msr = serial_in(up, UART_MSR);
 			up->msr_saved_flags |= msr & MSR_SAVE_FLAGS;
diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index 4d180c9..6d7a801 100644
--- a/drivers/tty/serial/8250/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
@@ -28,7 +28,7 @@ 
     and other provisions required by the GPL.  If you do not delete
     the provisions above, a recipient may use your version of this
     file under either the MPL or the GPL.
-    
+
 ======================================================================*/
 
 #include <linux/module.h>
@@ -257,7 +257,7 @@  static const struct serial_quirk quirks[] = {
 };
 
 
-static int serial_config(struct pcmcia_device * link);
+static int serial_config(struct pcmcia_device *link);
 
 
 static void serial_remove(struct pcmcia_device *link)
@@ -309,7 +309,7 @@  static int serial_probe(struct pcmcia_device *link)
 	dev_dbg(&link->dev, "serial_attach()\n");
 
 	/* Create new serial device */
-	info = kzalloc(sizeof (*info), GFP_KERNEL);
+	info = kzalloc(sizeof(*info), GFP_KERNEL);
 	if (!info)
 		return -ENOMEM;
 	info->p_dev = link;
@@ -339,7 +339,7 @@  static void serial_detach(struct pcmcia_device *link)
 
 /*====================================================================*/
 
-static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,
+static int setup_serial(struct pcmcia_device *handle, struct serial_info *info,
 			unsigned int iobase, int irq)
 {
 	struct uart_8250_port uart;
@@ -600,7 +600,7 @@  static int serial_check_for_multi(struct pcmcia_device *p_dev,  void *priv_data)
 }
 
 
-static int serial_config(struct pcmcia_device * link)
+static int serial_config(struct pcmcia_device *link)
 {
 	struct serial_info *info = link->priv;
 	int i;
@@ -701,7 +701,7 @@  static const struct pcmcia_device_id serial_ids[] = {
 	PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
 	PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e),
 	PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),
-	PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
+	PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001", 0x18df0ba0, 0x831b1064),
 	PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamonds Modem+Ethernet", 0xc2f80cd, 0x656947b9),
 	PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),
 	PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
@@ -797,30 +797,30 @@  static const struct pcmcia_device_id serial_ids[] = {
 	PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
 	PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis"),
-	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100  1.00.",0x19ca78af,0xf964f42b),
-	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83),
-	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232  1.00.",0x19ca78af,0x69fb7490),
-	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232",0x19ca78af,0xb6bc0235),
-	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232",0x63f2e0bd,0xb9e175d3),
-	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232-5",0x63f2e0bd,0xfce33442),
-	PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232",0x3beb8cf2,0x171e7190),
-	PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232-5",0x3beb8cf2,0x20da4262),
-	PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF428",0x3beb8cf2,0xea5dd57d),
-	PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF500",0x3beb8cf2,0xd77255fa),
-	PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: IC232",0x3beb8cf2,0x6a709903),
-	PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: SL232",0x3beb8cf2,0x18430676),
-	PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: XL232",0x3beb8cf2,0x6f933767),
-	PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
-	PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
-	PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
-	PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
-	PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc),
-	PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
-	PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
-	PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
-	PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
-	PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
-	PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL100  1.00.", 0x19ca78af, 0xf964f42b),
+	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL100", 0x19ca78af, 0x71d98e83),
+	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232  1.00.", 0x19ca78af, 0x69fb7490),
+	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232", 0x19ca78af, 0xb6bc0235),
+	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL CARD: CF232", 0x63f2e0bd, 0xb9e175d3),
+	PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL CARD: CF232-5", 0x63f2e0bd, 0xfce33442),
+	PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232", 0x3beb8cf2, 0x171e7190),
+	PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232-5", 0x3beb8cf2, 0x20da4262),
+	PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF428", 0x3beb8cf2, 0xea5dd57d),
+	PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF500", 0x3beb8cf2, 0xd77255fa),
+	PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: IC232", 0x3beb8cf2, 0x6a709903),
+	PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: SL232", 0x3beb8cf2, 0x18430676),
+	PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: XL232", 0x3beb8cf2, 0x6f933767),
+	PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: CF332", 0x3beb8cf2, 0x16dc1ba7),
+	PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL332", 0x3beb8cf2, 0x19816c41),
+	PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL385", 0x3beb8cf2, 0x64112029),
+	PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+	PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial+Parallel Port: SP230", 0x3beb8cf2, 0xdb9e58bc),
+	PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: CF332", 0x3beb8cf2, 0x16dc1ba7),
+	PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL332", 0x3beb8cf2, 0x19816c41),
+	PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL385", 0x3beb8cf2, 0x64112029),
+	PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+	PCMCIA_MFC_DEVICE_PROD_ID12(2, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+	PCMCIA_MFC_DEVICE_PROD_ID12(3, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
 	PCMCIA_DEVICE_MANF_CARD(0x0279, 0x950b),
 	/* too generic */
 	/* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */