From c40275bce0efb8b79792c7a6f846204b4c317124 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 27 Dec 2017 22:11:30 +0100 Subject: 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 Reviewed-on: https://review.coreboot.org/23006 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/superio/ite/it8623e/superio.c | 21 +++++++++++---------- src/superio/ite/it8671f/superio.c | 10 +++++----- src/superio/ite/it8712f/superio.c | 26 +++++++++++++------------- src/superio/ite/it8716f/superio.c | 22 +++++++++++----------- src/superio/ite/it8718f/superio.c | 17 ++++++++--------- src/superio/ite/it8720f/superio.c | 21 ++++++++++----------- src/superio/ite/it8721f/superio.c | 9 +++++---- src/superio/ite/it8728f/superio.c | 19 ++++++++++--------- src/superio/ite/it8772f/superio.c | 17 ++++++++--------- src/superio/ite/it8783ef/superio.c | 29 ++++++++++++++--------------- 10 files changed, 95 insertions(+), 96 deletions(-) diff --git a/src/superio/ite/it8623e/superio.c b/src/superio/ite/it8623e/superio.c index a9cd4e55ae..d735a5948f 100644 --- a/src/superio/ite/it8623e/superio.c +++ b/src/superio/ite/it8623e/superio.c @@ -60,20 +60,21 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, IT8623E_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, - { &ops, IT8623E_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, IT8623E_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, IT8623E_PP, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, 0x0ff8, }, - { &ops, IT8623E_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ff0, 0x0ff0, }, - { &ops, IT8623E_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, }, - { &ops, IT8623E_KBCM, PNP_IRQ0, }, - { &ops, IT8623E_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0, 0x0fff, 0x0fe0, 0x0fff, }, + { NULL, IT8623E_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, + { NULL, IT8623E_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8623E_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8623E_PP, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_DRQ0, + 0x0ff8, 0x0ff8, }, + { NULL, IT8623E_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ff0, 0x0ff0, }, + { NULL, IT8623E_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, }, + { NULL, IT8623E_KBCM, PNP_IRQ0, }, + { NULL, IT8623E_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0, + 0x0fff, 0x0fe0, 0x0fff, }, }; static void enable_dev(struct device *dev) { - pnp_enable_devices(dev, &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_it8623e_ops = { diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c index 4fa24de4b5..70da2ab4e4 100644 --- a/src/superio/ite/it8671f/superio.c +++ b/src/superio/ite/it8671f/superio.c @@ -51,15 +51,15 @@ static struct device_operations ops = { /* TODO: FDC, PP, KBCM. */ static struct pnp_info pnp_dev_info[] = { - { &ops, IT8671F_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, IT8671F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, }, - { &ops, IT8671F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, + { NULL, IT8671F_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, IT8671F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, + 0x07f8, }, + { NULL, IT8671F_KBCK, 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_ite_it8671f_ops = { diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c index 6501a60ba0..64cc9cff33 100644 --- a/src/superio/ite/it8712f/superio.c +++ b/src/superio/ite/it8712f/superio.c @@ -62,23 +62,23 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, IT8712F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, - { &ops, IT8712F_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, IT8712F_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, IT8712F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ffc, }, - { &ops, IT8712F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ff8, 0x0ff8, }, - { &ops, IT8712F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, }, - { &ops, IT8712F_KBCM, PNP_IRQ0, }, - { &ops, IT8712F_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0, 0x0fff, 0x0ff8, 0x0ff8, }, - { &ops, IT8712F_MIDI, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, IT8712F_GAME, PNP_IO0, 0x0fff, }, - { &ops, IT8712F_IR, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8712F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, + { NULL, IT8712F_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8712F_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8712F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ffc, }, + { NULL, IT8712F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ff8, 0x0ff8, }, + { NULL, IT8712F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, }, + { NULL, IT8712F_KBCM, PNP_IRQ0, }, + { NULL, IT8712F_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0, + 0x0fff, 0x0ff8, 0x0ff8, }, + { NULL, IT8712F_MIDI, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8712F_GAME, PNP_IO0, 0x0fff, }, + { NULL, IT8712F_IR, PNP_IO0 | PNP_IRQ0, 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_it8712f_ops = { diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c index b4cd5e6d45..50ab2b9574 100644 --- a/src/superio/ite/it8716f/superio.c +++ b/src/superio/ite/it8716f/superio.c @@ -75,17 +75,17 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, IT8716F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, IT8716F_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, IT8716F_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, IT8716F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, IT8716F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, - { &ops, IT8716F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07ff, 0x07ff, }, - { &ops, IT8716F_KBCM, PNP_IRQ0, }, - { &ops, IT8716F_GPIO, PNP_IO1 | PNP_IO2, 0, 0x07f8, 0x07f8, }, - { &ops, IT8716F_MIDI, PNP_IO0 | PNP_IRQ0, 0x07fe, }, - { &ops, IT8716F_GAME, PNP_IO0, 0x07ff, }, - { &ops, IT8716F_IR, }, + { NULL, IT8716F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, IT8716F_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, IT8716F_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, IT8716F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, IT8716F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, + { NULL, IT8716F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07ff, 0x07ff, }, + { NULL, IT8716F_KBCM, PNP_IRQ0, }, + { NULL, IT8716F_GPIO, PNP_IO1 | PNP_IO2, 0, 0x07f8, 0x07f8, }, + { NULL, IT8716F_MIDI, PNP_IO0 | PNP_IRQ0, 0x07fe, }, + { NULL, IT8716F_GAME, PNP_IO0, 0x07ff, }, + { NULL, IT8716F_IR, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c index ca2fedb6d3..ed15955426 100644 --- a/src/superio/ite/it8718f/superio.c +++ b/src/superio/ite/it8718f/superio.c @@ -65,25 +65,24 @@ static struct device_operations ops = { /* TODO: IR. */ static struct pnp_info pnp_dev_info[] = { - { &ops, IT8718F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 + { NULL, IT8718F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_MSC0 | PNP_MSC1, 0x0ff8, }, - { &ops, IT8718F_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, IT8718F_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, IT8718F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 + { NULL, IT8718F_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, IT8718F_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, IT8718F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC0 | PNP_MSC1 | PNP_MSC2 | PNP_MSC3 | PNP_MSC4 | PNP_MSC5 | PNP_MSC6, 0x0ff8, 0x0ff8, }, - { &ops, IT8718F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0 + { NULL, IT8718F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC0, 0x07f8, 0x07f8, }, - { &ops, IT8718F_KBCM, PNP_IRQ0 | PNP_MSC0, }, - { &ops, IT8718F_PP, PNP_IO0 | PNP_IO1 | PNP_IRQ0 + { NULL, IT8718F_KBCM, PNP_IRQ0 | PNP_MSC0, }, + { NULL, IT8718F_PP, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_DRQ0 | PNP_MSC0, 0x0ff8, 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_it8718f_ops = { diff --git a/src/superio/ite/it8720f/superio.c b/src/superio/ite/it8720f/superio.c index be44e39b17..142686e939 100644 --- a/src/superio/ite/it8720f/superio.c +++ b/src/superio/ite/it8720f/superio.c @@ -82,41 +82,40 @@ static struct device_operations ops = { }; 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 = { diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c index cd01f30c72..52a145632d 100644 --- a/src/superio/ite/it8721f/superio.c +++ b/src/superio/ite/it8721f/superio.c @@ -56,14 +56,15 @@ static struct device_operations ops = { /* TODO: FDC, PP, EC, KBCM, IR. */ static struct pnp_info pnp_dev_info[] = { - { &ops, IT8721F_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, IT8721F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, }, - { &ops, IT8721F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, + { NULL, IT8721F_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, IT8721F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, + 0x07f8, }, + { NULL, IT8721F_KBCK, 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_ite_it8721f_ops = { diff --git a/src/superio/ite/it8728f/superio.c b/src/superio/ite/it8728f/superio.c index 4250a885de..912a4c3ce6 100644 --- a/src/superio/ite/it8728f/superio.c +++ b/src/superio/ite/it8728f/superio.c @@ -59,15 +59,16 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, IT8728F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, - { &ops, IT8728F_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, IT8728F_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, - { &ops, IT8728F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ffc, }, - { &ops, IT8728F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ff8, 0x0ff8, }, - { &ops, IT8728F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, }, - { &ops, IT8728F_KBCM, PNP_IRQ0, }, - { &ops, IT8728F_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0, 0x0fff, 0x0ff8, 0x0ff8, }, - { &ops, IT8728F_IR, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8728F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ff8, }, + { NULL, IT8728F_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8728F_SP2, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8728F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x0ffc, }, + { NULL, IT8728F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0ff8, 0x0ff8, }, + { NULL, IT8728F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, }, + { NULL, IT8728F_KBCM, PNP_IRQ0, }, + { NULL, IT8728F_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0, + 0x0fff, 0x0ff8, 0x0ff8, }, + { NULL, IT8728F_IR, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index 015db80cdd..ed46e73559 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -267,29 +267,28 @@ static struct device_operations ops = { static struct pnp_info pnp_dev_info[] = { /* Floppy Disk Controller */ - { &ops, IT8772F_FDC, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8772F_FDC, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, /* Serial Port 1 */ - { &ops, IT8772F_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8772F_SP1, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, /* Environmental Controller */ - { &ops, IT8772F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | + { NULL, IT8772F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC4 | PNP_MSCA, 0x0ff8, 0x0ffc, }, /* KBC Keyboard */ - { &ops, IT8772F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, + { NULL, IT8772F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0fff, 0x0fff, }, /* KBC Mouse */ - { &ops, IT8772F_KBCM, PNP_IRQ0, }, + { NULL, IT8772F_KBCM, PNP_IRQ0, }, /* 27 GPIOs */ - { &ops, IT8772F_GPIO, PNP_IO0 | PNP_IO1, + { NULL, IT8772F_GPIO, PNP_IO0 | PNP_IO1, 0x0fff, 0x0ff8, }, /* Infrared */ - { &ops, IT8772F_IR, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, IT8772F_IR, PNP_IO0 | PNP_IRQ0, 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_it8772f_ops = { diff --git a/src/superio/ite/it8783ef/superio.c b/src/superio/ite/it8783ef/superio.c index 71ac4dcbbe..d734e7c0ba 100644 --- a/src/superio/ite/it8783ef/superio.c +++ b/src/superio/ite/it8783ef/superio.c @@ -58,48 +58,47 @@ static struct device_operations ops = { static struct pnp_info pnp_dev_info[] = { /* Floppy Disk Controller */ - { &ops, IT8783EF_FDC, PNP_IO0 | PNP_IRQ0 | PNP_MSC0 | PNP_MSC1, + { NULL, IT8783EF_FDC, PNP_IO0 | PNP_IRQ0 | PNP_MSC0 | PNP_MSC1, 0x0ff8, }, /* Serial Port 1 */ - { &ops, IT8783EF_SP1, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, + { NULL, IT8783EF_SP1, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, /* Serial Port 2 */ - { &ops, IT8783EF_SP2, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, + { NULL, IT8783EF_SP2, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, /* Printer Port */ - { &ops, IT8783EF_PP, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_DRQ0 | + { NULL, IT8783EF_PP, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_DRQ0 | PNP_MSC0, 0x0ffc, 0x0ffc, }, /* Environmental Controller */ - { &ops, IT8783EF_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC0 | + { NULL, IT8783EF_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC0 | PNP_MSC1 | PNP_MSC2 | PNP_MSC3 | PNP_MSC4 | PNP_MSC5 | PNP_MSC6 | PNP_MSC7, 0x0ff8, 0x0ff8, }, /* KBC Keyboard */ - { &ops, IT8783EF_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC0, + { NULL, IT8783EF_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC0, 0x0fff, 0x0fff, }, /* KBC Mouse */ - { &ops, IT8783EF_KBCM, PNP_IRQ0 | PNP_MSC0, }, + { NULL, IT8783EF_KBCM, PNP_IRQ0 | PNP_MSC0, }, /* GPIO */ - { &ops, IT8783EF_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0 | + { NULL, IT8783EF_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0 | PNP_MSC0 | PNP_MSC1 | PNP_MSC2 | PNP_MSC3 | PNP_MSC4 | PNP_MSC5 | PNP_MSC6 | PNP_MSC7 | PNP_MSC8 | PNP_MSC9 | PNP_MSCA | PNP_MSCB, 0x0ffc, 0x0fff, 0x0ff8, }, /* Serial Port 3 */ - { &ops, IT8783EF_SP3, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, + { NULL, IT8783EF_SP3, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, /* Serial Port 4 */ - { &ops, IT8783EF_SP4, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, + { NULL, IT8783EF_SP4, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, /* Serial Port 5 */ - { &ops, IT8783EF_SP5, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, + { NULL, IT8783EF_SP5, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, /* Serial Port 6 */ - { &ops, IT8783EF_SP6, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, + { NULL, IT8783EF_SP6, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, /* Consumer Infrared */ - { &ops, IT8783EF_CIR, PNP_IO0 | PNP_IRQ0 | PNP_MSC0, 0x0ff8, }, + { NULL, IT8783EF_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_it8783ef_ops = { -- cgit v1.2.3