commit c40275bce0efb8b79792c7a6f846204b4c317124
author Felix Held <felix-coreboot@felixheld.de> Wed Dec 27 22:11:30 2017 +0100
committer Felix Held <felix-coreboot@felixheld.de> Wed Jul 18 18:49:40 2018 +0000
tree e8f81f5970721ddc93b759d5374708de58ba9867
parent 3a59174cf02c8c0afd8eb547f5325788cd3537ea

superio/ite: pass the chip-specific ops struct to pnp_enable_devices

Pass the address of the chip-specific ops struct instead of the one of the
generic pnp_ops struct to the PNP device enable function.
This allows the removal of the LDN-specific ops overrides which is also done in
this patch.

Change-Id: I5f03a4064778c419f4b9c50e70db1296addf6c9e
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/23006
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>

src/superio/ite/it8720f/superio.c

diff --git a/src/superio/ite/it8720f/superio.c b/src/superio/ite/it8720f/superio.c
index be44e39..142686e 100644
--- a/src/superio/ite/it8720f/superio.c
+++ b/src/superio/ite/it8720f/superio.c
@@ -82,41 +82,40 @@
 };
 
 static struct pnp_info pnp_dev_info[] = {
-	{ &ops, IT8720F_FDC,
+	{ NULL, IT8720F_FDC,
 		PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_MSC0 | PNP_MSC1,
 		0x0ff8, },
-	{ &ops, IT8720F_SP1,
+	{ NULL, IT8720F_SP1,
 		PNP_IO0 | PNP_IRQ0 | PNP_MSC0 | PNP_MSC1,
 		0x0ff8, },
-	{ &ops, IT8720F_SP2,
+	{ NULL, IT8720F_SP2,
 		PNP_IO0 | PNP_IRQ0 | PNP_MSC0 | PNP_MSC1,
 		0x0ff8, },
-	{ &ops, IT8720F_PP,
+	{ NULL, IT8720F_PP,
 		PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_DRQ0 | PNP_MSC0,
 		0x0ff8, 0x0ffc, },
-	{ &ops, IT8720F_EC,
+	{ NULL, IT8720F_EC,
 		PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC0 | PNP_MSC1 | PNP_MSC2 |
 		PNP_MSC3 | PNP_MSC4 | PNP_MSC5 | PNP_MSC6,
 		0x0ff8, 0x0ffc, },
-	{ &ops, IT8720F_KBCK,
+	{ NULL, IT8720F_KBCK,
 		PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC0,
 		0x0fff, 0x0fff, },
-	{ &ops, IT8720F_KBCM,
+	{ NULL, IT8720F_KBCM,
 		PNP_IRQ0 | PNP_MSC0, },
-	{ &ops, IT8720F_GPIO,
+	{ NULL, IT8720F_GPIO,
 		PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_MSC0 | PNP_MSC1 | PNP_MSC2 |
 		PNP_MSC3 | PNP_MSC4 | PNP_MSC5 | PNP_MSC6 | PNP_MSC7 |
 		PNP_MSC8 | PNP_MSC9 | PNP_MSCA | PNP_MSCB | PNP_MSCD | PNP_MSCE,
 		0x0ff8, 0x0ff8, 0x0ff8, },
-	{ &ops, IT8720F_CIR,
+	{ NULL, IT8720F_CIR,
 		PNP_IO0 | PNP_IRQ0 | PNP_MSC0,
 		0x0ff8, },
 };
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &pnp_ops,
-		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+	pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
 struct chip_operations superio_ite_it8720f_ops = {