From 7daac912367c4b308038ae56f78c0a07e8a03082 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Tue, 6 Jun 2017 22:55:01 -0500 Subject: device/pnp: remove struct io_info The 'set' field was not used anywhere. Replace the struct with a simple integer representing the mask. initializer updates performed with: sed -i -r 's/\{ ?0(x([[:digit:]abcdefABCDEF]{3,4}))?, (0x)?[04]? ?\}/0\1/g' \ src/ec/*/*/ec.c sed -i -r 's/\{ ?0(x([[:digit:]abcdefABCDEF]{3,4}))?, (0x)?[04] ?\}/0\1/g' \ src/ec/*/*/ec_lpc.c \ src/superio/*/*/superio.c \ src/superio/smsc/fdc37n972/fdc37n972.c \ src/superio/smsc/sio10n268/sio10n268.c \ src/superio/via/vt1211/vt1211.c src/ec/kontron/it8516e/ec.c was manually updated. The previous value for IT8516E_LDN_SWUC appears to have been a typo, as it was out of range and had a zero bit in the middle of the mask. Change-Id: I1e7853844605cd2a6d568caf05488e1218fb53f9 Signed-off-by: Samuel Holland Reviewed-on: https://review.coreboot.org/20078 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Arthur Heymans Reviewed-by: Myles Watson Reviewed-by: Patrick Georgi --- src/superio/nuvoton/nct5572d/superio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/superio/nuvoton/nct5572d/superio.c') diff --git a/src/superio/nuvoton/nct5572d/superio.c b/src/superio/nuvoton/nct5572d/superio.c index 8c80a3ef93..04e6967088 100644 --- a/src/superio/nuvoton/nct5572d/superio.c +++ b/src/superio/nuvoton/nct5572d/superio.c @@ -96,16 +96,16 @@ static struct device_operations ops = { static struct pnp_info pnp_dev_info[] = { { &ops, NCT5572D_FDC}, /* no pins, removed from datasheet */ { &ops, NCT5572D_PP}, /* no pins, removed from datasheet */ - { &ops, NCT5572D_SP1, PNP_IO0 | PNP_IRQ0, {0x0FF8, 0}, }, - { &ops, NCT5572D_IR, PNP_IO0 | PNP_IRQ0, {0x0FF8, 0}, }, - { &ops, NCT5572D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x0FFF, 0}, {0x0FFF, 4}, }, - { &ops, NCT5572D_CIR, PNP_IO0 | PNP_IRQ0, {0x0FF8, 0}, }, + { &ops, NCT5572D_SP1, PNP_IO0 | PNP_IRQ0, 0x0FF8, }, + { &ops, NCT5572D_IR, PNP_IO0 | PNP_IRQ0, 0x0FF8, }, + { &ops, NCT5572D_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x0FFF, 0x0FFF, }, + { &ops, NCT5572D_CIR, PNP_IO0 | PNP_IRQ0, 0x0FF8, }, { &ops, NCT5572D_WDT1}, { &ops, NCT5572D_ACPI}, - { &ops, NCT5572D_HWM_TSI_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x0FFE, 0}, {0x0FFE, 4}, }, + { &ops, NCT5572D_HWM_TSI_FPLED, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x0FFE, 0x0FFE, }, { &ops, NCT5572D_PECI}, { &ops, NCT5572D_SUSLED}, - { &ops, NCT5572D_CIRWKUP, PNP_IO0 | PNP_IRQ0, {0x0FF8, 0}, }, + { &ops, NCT5572D_CIRWKUP, PNP_IO0 | PNP_IRQ0, 0x0FF8, }, { &ops, NCT5572D_GPIO_PP_OD}, { &ops, NCT5572D_GPIO2}, { &ops, NCT5572D_GPIO3}, -- cgit v1.2.3