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/it8712f/superio.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/superio/ite/it8712f') 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 = { -- cgit v1.2.3