Please correct me if I'm wrong, but I think pnp_ops will never be used
anyway (every Super I/O defines its own 'ops' struct)...


Uwe.
-- 
http://www.hermann-uwe.de  | http://www.holsham-traders.de
http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
Various Super I/Os were incorrectly using the global 'pnp_ops' struct
instead of the 'ops' one which is usually defined in superio.c.

As the global 'pnp_ops' is really never used as is (as all Super I/Os
we currently use define their own 'ops'), drop it.

Signed-off-by: Uwe Hermann <[EMAIL PROTECTED]>

Index: src/devices/pnp_device.c
===================================================================
--- src/devices/pnp_device.c	(Revision 3635)
+++ src/devices/pnp_device.c	(Arbeitskopie)
@@ -157,13 +157,6 @@
 	}
 }
 
-struct device_operations pnp_ops = {
-	.read_resources   = pnp_read_resources,
-	.set_resources    = pnp_set_resources,
-	.enable_resources = pnp_enable_resources,
-	.enable           = pnp_enable,
-};
-
 /* PNP chip opertations */
 
 static void pnp_get_ioresource(device_t dev, unsigned index, struct io_info *info)
Index: src/include/device/pnp.h
===================================================================
--- src/include/device/pnp.h	(Revision 3635)
+++ src/include/device/pnp.h	(Arbeitskopie)
@@ -21,8 +21,6 @@
 void pnp_enable_resources(device_t dev);
 void pnp_enable(device_t dev);
 
-struct device_operations pnp_ops;
-
 /* PNP helper operations */
 
 struct io_info {
Index: src/superio/ite/it8712f/superio.c
===================================================================
--- src/superio/ite/it8712f/superio.c	(Revision 3635)
+++ src/superio/ite/it8712f/superio.c	(Arbeitskopie)
@@ -137,7 +137,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/ite/it8705f/superio.c
===================================================================
--- src/superio/ite/it8705f/superio.c	(Revision 3635)
+++ src/superio/ite/it8705f/superio.c	(Arbeitskopie)
@@ -80,7 +80,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/ite/it8661f/superio.c
===================================================================
--- src/superio/ite/it8661f/superio.c	(Revision 3635)
+++ src/superio/ite/it8661f/superio.c	(Arbeitskopie)
@@ -72,7 +72,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/ite/it8671f/superio.c
===================================================================
--- src/superio/ite/it8671f/superio.c	(Revision 3635)
+++ src/superio/ite/it8671f/superio.c	(Arbeitskopie)
@@ -77,7 +77,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/ite/it8673f/superio.c
===================================================================
--- src/superio/ite/it8673f/superio.c	(Revision 3635)
+++ src/superio/ite/it8673f/superio.c	(Arbeitskopie)
@@ -79,7 +79,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/ite/it8718f/superio.c
===================================================================
--- src/superio/ite/it8718f/superio.c	(Revision 3635)
+++ src/superio/ite/it8718f/superio.c	(Arbeitskopie)
@@ -81,7 +81,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/nsc/pc87366/superio.c
===================================================================
--- src/superio/nsc/pc87366/superio.c	(Revision 3635)
+++ src/superio/nsc/pc87366/superio.c	(Arbeitskopie)
@@ -67,7 +67,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops, 
+	pnp_enable_devices(dev, &ops, 
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/nsc/pc87351/superio.c
===================================================================
--- src/superio/nsc/pc87351/superio.c	(Revision 3635)
+++ src/superio/nsc/pc87351/superio.c	(Arbeitskopie)
@@ -71,7 +71,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/nsc/pc87309/superio.c
===================================================================
--- src/superio/nsc/pc87309/superio.c	(Revision 3635)
+++ src/superio/nsc/pc87309/superio.c	(Arbeitskopie)
@@ -73,7 +73,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/nsc/pc87417/superio.c
===================================================================
--- src/superio/nsc/pc87417/superio.c	(Revision 3635)
+++ src/superio/nsc/pc87417/superio.c	(Arbeitskopie)
@@ -68,7 +68,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/smsc/lpc47m10x/superio.c
===================================================================
--- src/superio/smsc/lpc47m10x/superio.c	(Revision 3635)
+++ src/superio/smsc/lpc47m10x/superio.c	(Arbeitskopie)
@@ -82,7 +82,7 @@
 //
 static void enable_dev(device_t dev)
 {
-	pnp_enable_devices(dev, &pnp_ops, 
+	pnp_enable_devices(dev, &ops, 
 					   ARRAY_SIZE(pnp_dev_info), 
 					   pnp_dev_info);
 }
Index: src/superio/smsc/fdc37m60x/superio.c
===================================================================
--- src/superio/smsc/fdc37m60x/superio.c	(Revision 3635)
+++ src/superio/smsc/fdc37m60x/superio.c	(Arbeitskopie)
@@ -77,7 +77,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
Index: src/superio/smsc/lpc47n217/superio.c
===================================================================
--- src/superio/smsc/lpc47n217/superio.c	(Revision 3635)
+++ src/superio/smsc/lpc47n217/superio.c	(Arbeitskopie)
@@ -86,7 +86,7 @@
 //
 static void enable_dev(device_t dev)
 {
-	pnp_enable_devices(dev, &pnp_ops, 
+	pnp_enable_devices(dev, &ops, 
 					   ARRAY_SIZE(pnp_dev_info), 
 					   pnp_dev_info);
 }
Index: src/superio/smsc/lpc47b272/superio.c
===================================================================
--- src/superio/smsc/lpc47b272/superio.c	(Revision 3635)
+++ src/superio/smsc/lpc47b272/superio.c	(Arbeitskopie)
@@ -84,7 +84,7 @@
 //
 static void enable_dev(device_t dev)
 {
-	pnp_enable_devices(dev, &pnp_ops, 
+	pnp_enable_devices(dev, &ops, 
 					   ARRAY_SIZE(pnp_dev_info), 
 					   pnp_dev_info);
 }
Index: src/superio/smsc/smscsuperio/superio.c
===================================================================
--- src/superio/smsc/smscsuperio/superio.c	(Revision 3635)
+++ src/superio/smsc/smscsuperio/superio.c	(Arbeitskopie)
@@ -321,7 +321,7 @@
 	}
 
 	/* Enable the specified devices (if present on the chip). */
-	pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
+	pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info),
 			   &pnp_dev_info);
 
 	/* Restore LD_FOO values. */
Index: src/superio/smsc/lpc47b397/superio.c
===================================================================
--- src/superio/smsc/lpc47b397/superio.c	(Revision 3635)
+++ src/superio/smsc/lpc47b397/superio.c	(Arbeitskopie)
@@ -207,7 +207,7 @@
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
+	pnp_enable_devices(dev, &ops,
 		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to