Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18fd470a authored Oct 27, 2011 by Witold Szczeponik Committed by Len Brown Nov 06, 2011

PNPACPI: Simplify disabled resource registration



The attached patch simplifies 29df8d8f.  As
the "pnp_xxx" structs are not designed to cope with IORESOURCE_DISABLED, and
hence no code can test for this value, setting this value is actually a "no op"
and can be skipped altogether.  It is sufficient to remove the checks for
"empty" resources and continue processing.

The patch is applied against 3.1.

Signed-off-by: Witold Szczeponik <Witold.Szczeponik@gmx.net>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Len Brown <len.brown@intel.com>

parent c3b92c87

drivers/pnp/pnpacpi/rsparser.c

+15 −47

Original line number	Diff line number	Diff line
		@@ -509,15 +509,12 @@ static __init void pnpacpi_parse_dma_option(struct pnp_dev *dev,
		struct acpi_resource_dma *p)
		{
		int i;
		unsigned char map = 0, flags = 0;

		if (p->channel_count == 0)
		flags \|= IORESOURCE_DISABLED;
		unsigned char map = 0, flags;

		for (i = 0; i < p->channel_count; i++)
		map \|= 1 << p->channels[i];

		flags \|= dma_flags(dev, p->type, p->bus_master, p->transfer);
		flags = dma_flags(dev, p->type, p->bus_master, p->transfer);
		pnp_register_dma_resource(dev, option_flags, map, flags);
		}

		@@ -527,17 +524,14 @@ static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev,
		{
		int i;
		pnp_irq_mask_t map;
		unsigned char flags = 0;

		if (p->interrupt_count == 0)
		flags \|= IORESOURCE_DISABLED;
		unsigned char flags;

		bitmap_zero(map.bits, PNP_IRQ_NR);
		for (i = 0; i < p->interrupt_count; i++)
		if (p->interrupts[i])
		__set_bit(p->interrupts[i], map.bits);

		flags \|= irq_flags(p->triggering, p->polarity, p->sharable);
		flags = irq_flags(p->triggering, p->polarity, p->sharable);
		pnp_register_irq_resource(dev, option_flags, &map, flags);
		}

		@@ -547,10 +541,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
		{
		int i;
		pnp_irq_mask_t map;
		unsigned char flags = 0;

		if (p->interrupt_count == 0)
		flags \|= IORESOURCE_DISABLED;
		unsigned char flags;

		bitmap_zero(map.bits, PNP_IRQ_NR);
		for (i = 0; i < p->interrupt_count; i++) {
		@@ -564,7 +555,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
		}
		}

		flags \|= irq_flags(p->triggering, p->polarity, p->sharable);
		flags = irq_flags(p->triggering, p->polarity, p->sharable);
		pnp_register_irq_resource(dev, option_flags, &map, flags);
		}

		@@ -574,11 +565,8 @@ static __init void pnpacpi_parse_port_option(struct pnp_dev *dev,
		{
		unsigned char flags = 0;

		if (io->address_length == 0)
		flags \|= IORESOURCE_DISABLED;

		if (io->io_decode == ACPI_DECODE_16)
		flags \|= IORESOURCE_IO_16BIT_ADDR;
		flags = IORESOURCE_IO_16BIT_ADDR;
		pnp_register_port_resource(dev, option_flags, io->minimum, io->maximum,
		io->alignment, io->address_length, flags);
		}
		@@ -587,13 +575,8 @@ static __init void pnpacpi_parse_fixed_port_option(struct pnp_dev *dev,
		unsigned int option_flags,
		struct acpi_resource_fixed_io *io)
		{
		unsigned char flags = 0;

		if (io->address_length == 0)
		flags \|= IORESOURCE_DISABLED;

		pnp_register_port_resource(dev, option_flags, io->address, io->address,
		0, io->address_length, flags \| IORESOURCE_IO_FIXED);
		0, io->address_length, IORESOURCE_IO_FIXED);
		}

		static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev,
		@@ -602,11 +585,8 @@ static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev,
		{
		unsigned char flags = 0;

		if (p->address_length == 0)
		flags \|= IORESOURCE_DISABLED;

		if (p->write_protect == ACPI_READ_WRITE_MEMORY)
		flags \|= IORESOURCE_MEM_WRITEABLE;
		flags = IORESOURCE_MEM_WRITEABLE;
		pnp_register_mem_resource(dev, option_flags, p->minimum, p->maximum,
		p->alignment, p->address_length, flags);
		}
		@@ -617,11 +597,8 @@ static __init void pnpacpi_parse_mem32_option(struct pnp_dev *dev,
		{
		unsigned char flags = 0;

		if (p->address_length == 0)
		flags \|= IORESOURCE_DISABLED;

		if (p->write_protect == ACPI_READ_WRITE_MEMORY)
		flags \|= IORESOURCE_MEM_WRITEABLE;
		flags = IORESOURCE_MEM_WRITEABLE;
		pnp_register_mem_resource(dev, option_flags, p->minimum, p->maximum,
		p->alignment, p->address_length, flags);
		}
		@@ -632,11 +609,8 @@ static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_dev *dev,
		{
		unsigned char flags = 0;

		if (p->address_length == 0)
		flags \|= IORESOURCE_DISABLED;

		if (p->write_protect == ACPI_READ_WRITE_MEMORY)
		flags \|= IORESOURCE_MEM_WRITEABLE;
		flags = IORESOURCE_MEM_WRITEABLE;
		pnp_register_mem_resource(dev, option_flags, p->address, p->address,
		0, p->address_length, flags);
		}
		@@ -656,19 +630,16 @@ static __init void pnpacpi_parse_address_option(struct pnp_dev *dev,
		return;
		}

		if (p->address_length == 0)
		flags \|= IORESOURCE_DISABLED;

		if (p->resource_type == ACPI_MEMORY_RANGE) {
		if (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY)
		flags \|= IORESOURCE_MEM_WRITEABLE;
		flags = IORESOURCE_MEM_WRITEABLE;
		pnp_register_mem_resource(dev, option_flags, p->minimum,
		p->minimum, 0, p->address_length,
		flags);
		} else if (p->resource_type == ACPI_IO_RANGE)
		pnp_register_port_resource(dev, option_flags, p->minimum,
		p->minimum, 0, p->address_length,
		flags \| IORESOURCE_IO_FIXED);
		IORESOURCE_IO_FIXED);
		}

		static __init void pnpacpi_parse_ext_address_option(struct pnp_dev *dev,
		@@ -678,19 +649,16 @@ static __init void pnpacpi_parse_ext_address_option(struct pnp_dev *dev,
		struct acpi_resource_extended_address64 *p = &r->data.ext_address64;
		unsigned char flags = 0;

		if (p->address_length == 0)
		flags \|= IORESOURCE_DISABLED;

		if (p->resource_type == ACPI_MEMORY_RANGE) {
		if (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY)
		flags \|= IORESOURCE_MEM_WRITEABLE;
		flags = IORESOURCE_MEM_WRITEABLE;
		pnp_register_mem_resource(dev, option_flags, p->minimum,
		p->minimum, 0, p->address_length,
		flags);
		} else if (p->resource_type == ACPI_IO_RANGE)
		pnp_register_port_resource(dev, option_flags, p->minimum,
		p->minimum, 0, p->address_length,
		flags \| IORESOURCE_IO_FIXED);
		IORESOURCE_IO_FIXED);
		}

		struct acpipnp_parse_option_s {