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

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

[Kyle Moffett]

[-- Attachment #1: Type: text/plain, Size: 95 bytes --]

This removes two simple siig functions that should just be integrated 
into the
calling code.


[-- Attachment #2.1: siig8250-header-cleanup.patch --]
[-- Type: application/applefile, Size: 1439 bytes --]

[-- Attachment #2.2: siig8250-header-cleanup.patch --]
[-- Type: application/octet-stream, Size: 2480 bytes --]

Index: drivers/parport/parport_serial.c
===================================================================
RCS file: /home/kyle/bklinux/cvs/linux-2.5/drivers/parport/parport_serial.c,v
retrieving revision 1.13
diff -u -r1.13 parport_serial.c
--- drivers/parport/parport_serial.c	24 Jun 2004 15:55:22 -0000	1.13
+++ drivers/parport/parport_serial.c	5 Jan 2005 04:23:08 -0000
@@ -26,7 +26,6 @@
 #include <linux/serial.h>
 #include <linux/serialP.h>
 #include <linux/list.h>
-#include <linux/8250_pci.h>
 
 #include <asm/serial.h>
 
@@ -159,12 +158,14 @@
 
 static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
 {
-	return pci_siig10x_fn(dev, enable);
+	if (enable)	return pci_siig10x_init(dev);
+	else		return 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);
+	if (enable)	return pci_siig20x_init(dev);
+	else		return 0;
 }
 
 static struct pci_board_no_ids pci_boards[] __devinitdata = {
Index: drivers/serial/8250_pci.c
===================================================================
RCS file: /home/kyle/bklinux/cvs/linux-2.5/drivers/serial/8250_pci.c,v
retrieving revision 1.39
diff -u -r1.39 8250_pci.c
--- drivers/serial/8250_pci.c	22 Nov 2004 16:43:12 -0000	1.39
+++ drivers/serial/8250_pci.c	5 Jan 2005 04:26:58 -0000
@@ -23,7 +23,6 @@
 #include <linux/delay.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
-#include <linux/8250_pci.h>
 #include <linux/bitops.h>
 
 #include <asm/byteorder.h>
@@ -440,25 +439,6 @@
 	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);
-
 /*
  * Timedia has an explosion of boards, and to avoid the PCI table from
  * growing *huge*, we use this function to collapse some 70 entries
Index: include/linux/8250_pci.h
===================================================================
RCS file: include/linux/8250_pci.h
diff -N include/linux/8250_pci.h
--- include/linux/8250_pci.h	21 Apr 2003 17:39:45 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-int pci_siig10x_fn(struct pci_dev *dev, int enable);
-int pci_siig20x_fn(struct pci_dev *dev, int enable);

[-- Attachment #3: Type: text/plain, Size: 311 bytes --]



Cheers,
Kyle Moffett

-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GCM/CS/IT/U d- s++: a18 C++++>$ UB/L/X/*++++(+)>$ P+++(++++)>$
L++++(+++) E W++(+) N+++(++) o? K? w--- O? M++ V? PS+() PE+(-) Y+
PGP+++ t+(+++) 5 X R? tv-(--) b++++(++) DI+ D+ G e->++++$ h!*()>++$ r  
!y?(-)
------END GEEK CODE BLOCK------

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

[Andrey Panin]

[-- Attachment #1.1: Type: text/plain, Size: 578 bytes --]

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@donpac.ru		| PGP key: wwwkeys.pgp.net

[-- Attachment #1.2: patch-siig-cleanup --]
[-- Type: text/plain, Size: 2987 bytes --]

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 #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

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

[Kyle Moffett]

On Jan 14, 2005, at 07:01, Andrey Panin wrote:
> 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 :/

Oops, sorry!

> Did you compiled the kernel with your patch applied ?

Yes, but I think I managed to lose some changes somewhere in the
process of managing my patchset.

> Please use attached patch instead.

Thanks,
Kyle Moffett

-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GCM/CS/IT/U d- s++: a18 C++++>$ UB/L/X/*++++(+)>$ P+++(++++)>$
L++++(+++) E W++(+) N+++(++) o? K? w--- O? M++ V? PS+() PE+(-) Y+
PGP+++ t+(+++) 5 X R? tv-(--) b++++(++) DI+ D+ G e->++++$ h!*()>++$ r  
!y?(-)
------END GEEK CODE BLOCK------