From 8c85880236d57abf05fb2578a97a3e6dd52e7b7c Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 6 Jul 2018 20:22:08 +0200 Subject: superio/winbond: remove LDN-specific ops overrides The pnp ops struct is already passed to the pnp_enable_devices function and it is used if no override is supplied in the elements of the pnp_info struct array Change-Id: I4311834f3970bd3471f2f5a73ca7da3c03936d37 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/27385 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Rudolph --- src/superio/winbond/w83697hf/superio.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/superio/winbond/w83697hf') diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c index e5e4e67800..0b63cd2773 100644 --- a/src/superio/winbond/w83697hf/superio.c +++ b/src/superio/winbond/w83697hf/superio.c @@ -77,16 +77,17 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, W83697HF_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, W83697HF_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, - { &ops, W83697HF_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, W83697HF_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, W83697HF_CIR, PNP_IO0 | PNP_IRQ0, 0x07f8, }, - { &ops, W83697HF_GAME_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07ff, 0x07fe, }, - { &ops, W83697HF_MIDI_GPIO5, }, - { &ops, W83697HF_GPIO234, }, - { &ops, W83697HF_ACPI, }, - { &ops, W83697HF_HWM, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { NULL, W83697HF_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, W83697HF_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { NULL, W83697HF_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, W83697HF_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, W83697HF_CIR, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, W83697HF_GAME_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, + 0x07ff, 0x07fe, }, + { NULL, W83697HF_MIDI_GPIO5, }, + { NULL, W83697HF_GPIO234, }, + { NULL, W83697HF_ACPI, }, + { NULL, W83697HF_HWM, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, }; static void enable_dev(struct device *dev) -- cgit v1.2.3