Re: [PATCH] [2.6] Clean up useless 8250 siig functions and header

[Andrey Panin]

On 005, 01 05, 2005 at 05:52:14PM -0500, Kyle Moffett wrote:
> This removes two simple siig functions that should just be integrated 
> into the calling code.

Good idea, wrong patch. You deleted wrapper code, but actual init
functions left not exported for use by parport_serial module.
Even worse, they are left static, so monilithic kernel build will
not work too :/

Did you compiled the kernel with your patch applied ?

Please use attached patch instead.

-- 
Andrey Panin		| Linux and UNIX system administrator
pazke@xxxxxxxxx		| PGP key: wwwkeys.pgp.net
diff -urdpNX /usr/share/dontdiff linux-2.6.11-rc1.vanilla/drivers/parport/parport_serial.c linux-2.6.11-rc1/drivers/parport/parport_serial.c
--- linux-2.6.11-rc1.vanilla/drivers/parport/parport_serial.c	2004-12-25 00:35:28.000000000 +0300
+++ linux-2.6.11-rc1/drivers/parport/parport_serial.c	2005-01-14 10:38:53.000000000 +0300
@@ -159,12 +159,12 @@ struct pci_board_no_ids {
 
 static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
 {
-	return pci_siig10x_fn(dev, enable);
+	return enable ? pci_siig10x_init(dev) : 0;
 }
 
 static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
 {
-	return pci_siig20x_fn(dev, enable);
+	return enable ? pci_siig20x_init(dev) : 0;
 }
 
 static struct pci_board_no_ids pci_boards[] __devinitdata = {
diff -urdpNX /usr/share/dontdiff linux-2.6.11-rc1.vanilla/drivers/serial/8250_pci.c linux-2.6.11-rc1/drivers/serial/8250_pci.c
--- linux-2.6.11-rc1.vanilla/drivers/serial/8250_pci.c	2004-12-25 00:35:23.000000000 +0300
+++ linux-2.6.11-rc1/drivers/serial/8250_pci.c	2005-01-14 10:57:26.000000000 +0300
@@ -393,7 +392,7 @@ static void __devexit sbs_exit(struct pc
 #define PCI_DEVICE_ID_SIIG_1S_10x (PCI_DEVICE_ID_SIIG_1S_10x_550 & 0xfffc)
 #define PCI_DEVICE_ID_SIIG_2S_10x (PCI_DEVICE_ID_SIIG_2S_10x_550 & 0xfff8)
 
-static int pci_siig10x_init(struct pci_dev *dev)
+int pci_siig10x_init(struct pci_dev *dev)
 {
 	u16 data;
 	void __iomem *p;
@@ -419,11 +418,12 @@ static int pci_siig10x_init(struct pci_d
 	iounmap(p);
 	return 0;
 }
+EXPORT_SYMBOL(pci_siig10x_init);
 
 #define PCI_DEVICE_ID_SIIG_2S_20x (PCI_DEVICE_ID_SIIG_2S_20x_550 & 0xfffc)
 #define PCI_DEVICE_ID_SIIG_2S1P_20x (PCI_DEVICE_ID_SIIG_2S1P_20x_550 & 0xfffc)
 
-static int pci_siig20x_init(struct pci_dev *dev)
+int pci_siig20x_init(struct pci_dev *dev)
 {
 	u8 data;
 
@@ -439,25 +439,7 @@ static int pci_siig20x_init(struct pci_d
 	}
 	return 0;
 }
-
-int pci_siig10x_fn(struct pci_dev *dev, int enable)
-{
-	int ret = 0;
-	if (enable)
-		ret = pci_siig10x_init(dev);
-	return ret;
-}
-
-int pci_siig20x_fn(struct pci_dev *dev, int enable)
-{
-	int ret = 0;
-	if (enable)
-		ret = pci_siig20x_init(dev);
-	return ret;
-}
-
-EXPORT_SYMBOL(pci_siig10x_fn);
-EXPORT_SYMBOL(pci_siig20x_fn);
+EXPORT_SYMBOL(pci_siig20x_init);
 
 /*
  * Timedia has an explosion of boards, and to avoid the PCI table from
diff -urdpNX /usr/share/dontdiff linux-2.6.11-rc1.vanilla/include/linux/8250_pci.h linux-2.6.11-rc1/include/linux/8250_pci.h
--- linux-2.6.11-rc1.vanilla/include/linux/8250_pci.h	2004-12-25 00:35:25.000000000 +0300
+++ linux-2.6.11-rc1/include/linux/8250_pci.h	2005-01-14 10:57:42.000000000 +0300
@@ -1,2 +1,2 @@
-int pci_siig10x_fn(struct pci_dev *dev, int enable);
-int pci_siig20x_fn(struct pci_dev *dev, int enable);
+int pci_siig10x_init(struct pci_dev *dev);
+int pci_siig20x_init(struct pci_dev *dev);

Attachment: signature.asc
Description: Digital signature