From faca0bc2fa5a347a98fc3ee8dd1a5dd9c9763459 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 27 Dec 2017 22:51:29 +0100 Subject: superio/nsc: 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: I0c820254e97e3f80470d148552af06940e147b74 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/23008 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/superio/nsc/pc87392/superio.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/superio/nsc/pc87392') diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c index e75e0a41f2..bf02e19eb1 100644 --- a/src/superio/nsc/pc87392/superio.c +++ b/src/superio/nsc/pc87392/superio.c @@ -37,18 +37,18 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, PC87392_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa }, - { &ops, PC87392_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8 }, - { &ops, PC87392_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8 }, - { &ops, PC87392_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 }, - { &ops, PC87392_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8 }, - { &ops, PC87392_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc }, + { NULL, PC87392_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa }, + { NULL, PC87392_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8 }, + { NULL, PC87392_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, + 0x07f8 }, + { NULL, PC87392_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8 }, + { NULL, PC87392_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8 }, + { NULL, PC87392_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc }, }; 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_nsc_pc87392_ops = { -- cgit v1.2.3