Re: Fw: [Bugme-new] [Bug 4334] New: kernel support for netmos9835/9735 crippled since 2.6.9

[Andrew Morton]

Thomas Richter <thor@xxxxxxxxxxxxxxxxx> wrote:
>
> 
> Hi Andrew,
>  
> > I'm inclined to simply revert that change.
> 
> In case the mentioned lines do cause problems, please do not hesitate
> to remove them. As the comments indicate, the patch was completely
> untested as I haven't had the cards available. However, please ensure
> that the parallel port remains available for the 9835/9735 in case
> they are removed from the parport module. Their references should be
> removed *only* from parport_pc, not from the PCI name database.
> 

OK.  Like this?

Steven, do you agree?

diff -puN drivers/parport/parport_pc.c~parport_pc-revert-netmos-patch drivers/parport/parport_pc.c
--- 25/drivers/parport/parport_pc.c~parport_pc-revert-netmos-patch	2005-03-14 01:55:52.000000000 -0800
+++ 25-akpm/drivers/parport/parport_pc.c	2005-03-14 01:59:32.000000000 -0800
@@ -2738,8 +2738,6 @@ enum parport_pc_pci_cards {
 	netmos_9855,
 	netmos_9735,
 	netmos_9835,
-	netmos_9755,
-	netmos_9715
 };
 
 
@@ -2813,10 +2811,8 @@ static struct parport_pc_pci {
 	/* netmos_9805 */               { 1, { { 0, -1 }, } }, /* untested */
 	/* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
 	/* netmos_9855 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
-	/* netmos_9735 */               { 1, { { 2, 3 }, } },  /* untested */
-	/* netmos_9835 */               { 1, { { 2, 3 }, } },  /* untested */
-        /* netmos_9755 */               { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */
-        /* netmos_9715 */               { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */
+	/* netmos_9735 */		{ 1, { { 2, 3 }, } },
+	/* netmos_9835 */		{ 1, { { 2, 3 }, } },
 };
 
 static struct pci_device_id parport_pc_pci_tbl[] = {
@@ -2899,10 +2895,6 @@ static struct pci_device_id parport_pc_p
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 },
 	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 },
-	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9755,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9755 },
-	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9715,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9715 },
 	{ 0, } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl);
diff -puN include/linux/pci_ids.h~parport_pc-revert-netmos-patch include/linux/pci_ids.h
--- 25/include/linux/pci_ids.h~parport_pc-revert-netmos-patch	2005-03-14 01:55:52.000000000 -0800
+++ 25-akpm/include/linux/pci_ids.h	2005-03-14 01:55:52.000000000 -0800
@@ -2530,8 +2530,6 @@
 #define PCI_DEVICE_ID_NETMOS_9815	0x9815
 #define PCI_DEVICE_ID_NETMOS_9835	0x9835
 #define PCI_DEVICE_ID_NETMOS_9855	0x9855
-#define PCI_DEVICE_ID_NETMOS_9755	0x9755
-#define PCI_DEVICE_ID_NETMOS_9715	0x9715
 
 #define PCI_SUBVENDOR_ID_EXSYS		0xd84d
 #define PCI_SUBDEVICE_ID_EXSYS_4014	0x4014
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/