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/include/device/pnp.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/include') diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h index bb66317742..e3839c6e71 100644 --- a/src/include/device/pnp.h +++ b/src/include/device/pnp.h @@ -30,10 +30,6 @@ extern struct device_operations pnp_ops; /* PNP helper operations */ -struct io_info { - unsigned int mask, set; -}; - struct pnp_info { struct device_operations *ops; unsigned int function; /* Must be at least 16 bits (virtual LDNs)! */ @@ -62,7 +58,7 @@ struct pnp_info { #define PNP_MSCC 0x200000 #define PNP_MSCD 0x400000 #define PNP_MSCE 0x800000 - struct io_info io0, io1, io2, io3; + u16 io0, io1, io2, io3; }; struct resource *pnp_get_resource(device_t dev, unsigned int index); void pnp_enable_devices(struct device *dev, struct device_operations *ops, -- cgit v1.2.3