diff options
| author | Samuel Holland <samuel@sholland.org> | 2017-06-06 22:55:01 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2017-06-13 15:21:58 +0200 |
| commit | 7daac912367c4b308038ae56f78c0a07e8a03082 (patch) | |
| tree | 24e70aa5e3beadc942c7aab9c76120d6a6d943e9 /src/device/pnp_device.c | |
| parent | c21ba2cd3e6af194cc4d933d4f7bd434dfb2ff04 (diff) | |
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 <samuel@sholland.org>
Reviewed-on: https://review.coreboot.org/20078
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Myles Watson <mylesgw@gmail.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/device/pnp_device.c')
| -rw-r--r-- | src/device/pnp_device.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c index a04469b4b8..e7839def2c 100644 --- a/src/device/pnp_device.c +++ b/src/device/pnp_device.c @@ -191,12 +191,12 @@ struct device_operations pnp_ops = { /* PNP chip operations */ -static void pnp_get_ioresource(device_t dev, u8 index, struct io_info *info) +static void pnp_get_ioresource(device_t dev, u8 index, u16 mask) { struct resource *resource; unsigned moving, gran, step; - if (!info->mask) { + if (!mask) { printk(BIOS_ERR, "ERROR: device %s index %d has no mask.\n", dev_path(dev), index); return; @@ -210,7 +210,7 @@ static void pnp_get_ioresource(device_t dev, u8 index, struct io_info *info) /* Get the resource size... */ - moving = info->mask; + moving = mask; gran = 15; step = 1 << gran; @@ -238,7 +238,7 @@ static void pnp_get_ioresource(device_t dev, u8 index, struct io_info *info) /* Set the resource size and alignment. */ resource->gran = gran; resource->align = gran; - resource->limit = info->mask | (step - 1); + resource->limit = mask | (step - 1); resource->size = 1 << gran; } @@ -247,13 +247,13 @@ static void get_resources(device_t dev, struct pnp_info *info) struct resource *resource; if (info->flags & PNP_IO0) - pnp_get_ioresource(dev, PNP_IDX_IO0, &info->io0); + pnp_get_ioresource(dev, PNP_IDX_IO0, info->io0); if (info->flags & PNP_IO1) - pnp_get_ioresource(dev, PNP_IDX_IO1, &info->io1); + pnp_get_ioresource(dev, PNP_IDX_IO1, info->io1); if (info->flags & PNP_IO2) - pnp_get_ioresource(dev, PNP_IDX_IO2, &info->io2); + pnp_get_ioresource(dev, PNP_IDX_IO2, info->io2); if (info->flags & PNP_IO3) - pnp_get_ioresource(dev, PNP_IDX_IO3, &info->io3); + pnp_get_ioresource(dev, PNP_IDX_IO3, info->io3); if (info->flags & PNP_IRQ0) { resource = new_resource(dev, PNP_IDX_IRQ0); |