From b0d868e8fe3f9a13f9be109fc3b73dfa949bec15 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 6 Jul 2018 23:39:00 +0200 Subject: [PATCH] superio/smsc: 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: I16e485494e448ae02e0a7b9e21b90ddbb1a53a4b Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/23007 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/superio/smsc/dme1737/superio.c | 16 ++++++------ src/superio/smsc/fdc37n972/superio.c | 9 +++---- src/superio/smsc/kbc1100/superio.c | 7 +++--- src/superio/smsc/lpc47b272/superio.c | 16 ++++++------ src/superio/smsc/lpc47b397/superio.c | 18 +++++++------- src/superio/smsc/lpc47m10x/superio.c | 16 ++++++------ src/superio/smsc/lpc47m15x/superio.c | 14 +++++------ src/superio/smsc/lpc47n217/superio.c | 9 +++---- src/superio/smsc/lpc47n227/superio.c | 11 ++++----- src/superio/smsc/mec1308/superio.c | 17 ++++++------- src/superio/smsc/sch4037/superio.c | 5 ++-- src/superio/smsc/sio1036/superio.c | 2 +- src/superio/smsc/sio10n268/superio.c | 5 ++-- src/superio/smsc/smscsuperio/superio.c | 34 +++++++++++++------------- 14 files changed, 87 insertions(+), 92 deletions(-) diff --git a/src/superio/smsc/dme1737/superio.c b/src/superio/smsc/dme1737/superio.c index 7b4b947aed..42b9284d87 100644 --- a/src/superio/smsc/dme1737/superio.c +++ b/src/superio/smsc/dme1737/superio.c @@ -50,18 +50,18 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, DME1737_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, DME1737_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, DME1737_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, DME1737_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, DME1737_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, - { &ops, DME1737_RT, PNP_IO0, 0x0780, }, + { NULL, DME1737_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, DME1737_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, DME1737_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, DME1737_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, DME1737_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x07ff, 0x07ff, }, + { NULL, DME1737_RT, PNP_IO0, 0x0780, }, }; 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_smsc_dme1737_ops = { diff --git a/src/superio/smsc/fdc37n972/superio.c b/src/superio/smsc/fdc37n972/superio.c index e729e0e5af..85e376d3d4 100644 --- a/src/superio/smsc/fdc37n972/superio.c +++ b/src/superio/smsc/fdc37n972/superio.c @@ -46,16 +46,15 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, FDC37N972_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, FDC37N972_SP2, + { NULL, FDC37N972_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, FDC37N972_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, }, - { &ops, FDC37N972_KBDC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, + { NULL, FDC37N972_KBDC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, }; 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_smsc_fdc37n972_ops = { diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c index 0f5ede19f2..bca4067e22 100644 --- a/src/superio/smsc/kbc1100/superio.c +++ b/src/superio/smsc/kbc1100/superio.c @@ -45,14 +45,13 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff, - 0x7ff, }, + { NULL, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x7ff, 0x7ff, }, }; 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); } static void kbc1100_init(struct device *dev) diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c index a269b3b26c..ded4bb00e1 100644 --- a/src/superio/smsc/lpc47b272/superio.c +++ b/src/superio/smsc/lpc47b272/superio.c @@ -61,12 +61,13 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47B272_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47B272_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47B272_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47B272_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47B272_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, - { &ops, LPC47B272_RT, PNP_IO0, 0x0780, }, + { NULL, LPC47B272_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47B272_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47B272_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47B272_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47B272_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x07ff, 0x07ff, }, + { NULL, LPC47B272_RT, PNP_IO0, 0x0780, }, }; /** @@ -77,8 +78,7 @@ static struct pnp_info pnp_dev_info[] = { */ 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_smsc_lpc47b272_ops = { diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c index 93e453fe23..ab2271a8ae 100644 --- a/src/superio/smsc/lpc47b397/superio.c +++ b/src/superio/smsc/lpc47b397/superio.c @@ -135,19 +135,19 @@ static struct device_operations ops_hwm = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47B397_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47B397_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47B397_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47B397_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47B397_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, - { &ops_hwm, LPC47B397_HWM, PNP_IO0, 0x07f0, }, - { &ops, LPC47B397_RT, PNP_IO0, 0x0780, }, + { NULL, LPC47B397_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47B397_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47B397_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47B397_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47B397_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x07ff, 0x07ff, }, + { NULL_hwm, LPC47B397_HWM, PNP_IO0, 0x07f0, }, + { NULL, LPC47B397_RT, PNP_IO0, 0x0780, }, }; 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_smsc_lpc47b397_ops = { diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c index 58e7c95127..18618d337b 100644 --- a/src/superio/smsc/lpc47m10x/superio.c +++ b/src/superio/smsc/lpc47m10x/superio.c @@ -59,12 +59,13 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47M10X2_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47M10X2_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47M10X2_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47M10X2_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47M10X2_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, - { &ops, LPC47M10X2_PME, PNP_IO0, 0x0f80, }, + { NULL, LPC47M10X2_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47M10X2_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47M10X2_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47M10X2_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47M10X2_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x07ff, 0x07ff, }, + { NULL, LPC47M10X2_PME, PNP_IO0, 0x0f80, }, }; /** @@ -75,8 +76,7 @@ static struct pnp_info pnp_dev_info[] = { */ 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_smsc_lpc47m10x_ops = { diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c index 814b70ef69..41339c1b7b 100644 --- a/src/superio/smsc/lpc47m15x/superio.c +++ b/src/superio/smsc/lpc47m15x/superio.c @@ -45,17 +45,17 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47M15X_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47M15X_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47M15X_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47M15X_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47M15X_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, + { NULL, LPC47M15X_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47M15X_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47M15X_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47M15X_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47M15X_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x07ff, 0x07ff, }, }; 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); } static void lpc47m15x_init(struct device *dev) diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c index 43b56dc549..e63645e522 100644 --- a/src/superio/smsc/lpc47n217/superio.c +++ b/src/superio/smsc/lpc47n217/superio.c @@ -57,9 +57,9 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47N217_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47N217_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47N217_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, } + { NULL, LPC47N217_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47N217_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47N217_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, } }; /** @@ -70,8 +70,7 @@ static struct pnp_info pnp_dev_info[] = { */ 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); } /** diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c index c83195730d..13eb9f2c58 100644 --- a/src/superio/smsc/lpc47n227/superio.c +++ b/src/superio/smsc/lpc47n227/superio.c @@ -55,10 +55,10 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47N227_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LPC47N227_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47N227_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LPC47N227_KBDC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, + { NULL, LPC47N227_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LPC47N227_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47N227_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LPC47N227_KBDC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, }; /** @@ -69,8 +69,7 @@ static struct pnp_info pnp_dev_info[] = { */ 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); } /** diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c index b11374c83a..2f17deb472 100644 --- a/src/superio/smsc/mec1308/superio.c +++ b/src/superio/smsc/mec1308/superio.c @@ -49,19 +49,18 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, MEC1308_PM1, PNP_IO0, 0x7ff }, - { &ops, MEC1308_EC1, PNP_IO0, 0x7ff }, - { &ops, MEC1308_EC2, PNP_IO0, 0x7ff }, - { &ops, MEC1308_UART, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, MEC1308_KBC, PNP_IRQ0, 0 /* IO Fixed at 0x60/0x64 */ }, - { &ops, MEC1308_EC0, PNP_IO0, 0x7ff }, - { &ops, MEC1308_MBX, PNP_IO0, 0x7ff }, + { NULL, MEC1308_PM1, PNP_IO0, 0x7ff }, + { NULL, MEC1308_EC1, PNP_IO0, 0x7ff }, + { NULL, MEC1308_EC2, PNP_IO0, 0x7ff }, + { NULL, MEC1308_UART, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, MEC1308_KBC, PNP_IRQ0, 0 /* IO Fixed at 0x60/0x64 */ }, + { NULL, MEC1308_EC0, PNP_IO0, 0x7ff }, + { NULL, MEC1308_MBX, PNP_IO0, 0x7ff }, }; 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_smsc_mec1308_ops = { diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c index 78c61487d1..5165dd6448 100644 --- a/src/superio/smsc/sch4037/superio.c +++ b/src/superio/smsc/sch4037/superio.c @@ -48,12 +48,13 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, SCH4037_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff, 0x7ff, }, + { NULL, SCH4037_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x7ff, 0x7ff, }, }; 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_smsc_sch4037_ops = { diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c index c1bfae348c..5725a6275a 100644 --- a/src/superio/smsc/sio1036/superio.c +++ b/src/superio/smsc/sio1036/superio.c @@ -41,7 +41,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, SIO1036_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, SIO1036_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/sio10n268/superio.c b/src/superio/smsc/sio10n268/superio.c index 704e91857f..b8243ece51 100644 --- a/src/superio/smsc/sio10n268/superio.c +++ b/src/superio/smsc/sio10n268/superio.c @@ -47,13 +47,12 @@ static struct device_operations ops = { /* TODO: FDC, PP, AUX. */ static struct pnp_info pnp_dev_info[] = { - { &ops, SIO10N268_KBDC, PNP_IO0 | PNP_IO1, 0x07f8, 0x07f8, }, + { NULL, SIO10N268_KBDC, PNP_IO0 | PNP_IO1, 0x07f8, 0x07f8, }, }; 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_smsc_sio10n268_ops = { diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c index 414ae8d8be..6380f88472 100644 --- a/src/superio/smsc/smscsuperio/superio.c +++ b/src/superio/smsc/smscsuperio/superio.c @@ -194,21 +194,22 @@ static struct device_operations ops = { * TODO: FDC, PP, SP1, SP2, and KBC should work, the rest probably not (yet). */ static struct pnp_info pnp_dev_info[] = { - { &ops, LD_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LD_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, LD_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LD_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, LD_RTC, }, - { &ops, LD_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, - { &ops, LD_AUX, }, - { &ops, LD_XBUS, }, - { &ops, LD_HWM, PNP_IO0, 0x07f0, }, - { &ops, LD_GAME, }, - { &ops, LD_PME, }, - { &ops, LD_MPU401, }, - { &ops, LD_RT, PNP_IO0, 0x0780, }, - { &ops, LD_ACPI, }, - { &ops, LD_SMB, }, + { NULL, LD_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LD_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, LD_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LD_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, LD_RTC, }, + { NULL, LD_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, + 0x07ff, 0x07ff, }, + { NULL, LD_AUX, }, + { NULL, LD_XBUS, }, + { NULL, LD_HWM, PNP_IO0, 0x07f0, }, + { NULL, LD_GAME, }, + { NULL, LD_PME, }, + { NULL, LD_MPU401, }, + { NULL, LD_RT, PNP_IO0, 0x0780, }, + { NULL, LD_ACPI, }, + { NULL, LD_SMB, }, }; /** @@ -281,8 +282,7 @@ static void enable_dev(struct device *dev) } /* Enable the specified devices (if present on the chip). */ - pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), - &pnp_dev_info[0]); + pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); /* Restore LD_FOO values. */ for (j = 0; j < ARRAY_SIZE(pnp_dev_info); j++)