From: Andrew Morton <akpm@linux-foundation.org>

- ARRAY_SIZE is neater and tighter than the terminate-it-in-null thing.

- fix lots of broken whitespace

Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Christian Schmidt <schmidt@digadd.de>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Cc: Yinghai Lu <yinghai.lu@sun.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/serial/8250_pci.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff -puN drivers/serial/8250_pci.c~add-blacklisting-capability-to-serial_pci-to-avoid-misdetection-fix drivers/serial/8250_pci.c
--- a/drivers/serial/8250_pci.c~add-blacklisting-capability-to-serial_pci-to-avoid-misdetection-fix
+++ a/drivers/serial/8250_pci.c
@@ -1653,8 +1653,7 @@ static struct pciserial_board pci_boards
 };
 
 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 */
 };
 
 /*
@@ -1665,7 +1664,7 @@ static const struct pci_device_id softmo
 static int __devinit
 serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)
 {
-        const struct pci_device_id * blacklist;
+	const struct pci_device_id *blacklist;
 	int num_iomem, num_port, first_port = -1, i;
 	
 	/*
@@ -1684,10 +1683,12 @@ serial_pci_guess_board(struct pci_dev *d
 	 * Do not access blacklisted devices that are known not to
 	 * feature serial ports.
 	 */
-	for (blacklist = softmodem_blacklist; blacklist->vendor; blacklist++) {
-	        if ((dev->vendor == blacklist->vendor) &&
-	            (dev->device == blacklist->device))
-		        return -ENODEV;
+	for (blacklist = softmodem_blacklist;
+	     blacklist < softmodem_blacklist + ARRAY_SIZE(softmodem_blacklist);
+	     blacklist++) {
+		if (dev->vendor == blacklist->vendor &&
+		    dev->device == blacklist->device)
+			return -ENODEV;
 	}
 
 	num_iomem = num_port = 0;
_