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/nsc/pc87366/superio.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/superio/nsc/pc87366/superio.c') diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c index c02f53253f..8d5b291bfe 100644 --- a/src/superio/nsc/pc87366/superio.c +++ b/src/superio/nsc/pc87366/superio.c @@ -45,17 +45,17 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, PC87366_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0}, }, - { &ops, PC87366_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0}, }, - { &ops, PC87366_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, }, - { &ops, PC87366_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, PC87366_SWC, PNP_IO0 | PNP_IRQ0, {0xfff0, 0}, }, + { &ops, PC87366_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07fa, }, + { &ops, PC87366_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x04f8, }, + { &ops, PC87366_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, }, + { &ops, PC87366_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, PC87366_SWC, PNP_IO0 | PNP_IRQ0, 0xfff0, }, { &ops, PC87366_KBCM, PNP_IRQ0, }, - { &ops, PC87366_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, }, - { &ops, PC87366_GPIO, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, }, - { &ops, PC87366_ACB, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, }, - { &ops, PC87366_FSCM, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, }, - { &ops, PC87366_WDT, PNP_IO0 | PNP_IRQ0, {0xfffc, 0}, }, + { &ops, PC87366_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, + { &ops, PC87366_GPIO, PNP_IO0 | PNP_IRQ0, 0xfff8, }, + { &ops, PC87366_ACB, PNP_IO0 | PNP_IRQ0, 0xfff8, }, + { &ops, PC87366_FSCM, PNP_IO0 | PNP_IRQ0, 0xfff8, }, + { &ops, PC87366_WDT, PNP_IO0 | PNP_IRQ0, 0xfffc, }, }; static void enable_dev(struct device *dev) -- cgit v1.2.3