From b0d868e8fe3f9a13f9be109fc3b73dfa949bec15 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 6 Jul 2018 23:39:00 +0200 Subject: 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/mec1308/superio.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/superio/smsc/mec1308') 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 = { -- cgit v1.2.3