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

Commit 470feb11 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

PNP: reduce redundancy in pnp_set_current_resources() 



Use a temporary "res" pointer to replace repeated lookups in
the pnp resource tables.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 30c016a0

drivers/pnp/interface.c

+17 −24
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr, 
			  const char *ubuf, size_t count)

{

	struct pnp_dev *dev = to_pnp_dev(dmdev);

	struct resource *res;

	char *buf = (void *)ubuf;

	int retval = 0;
@@ -382,21 +383,18 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr, 
				buf += 2;

				while (isspace(*buf))

					++buf;

				dev->res.port_resource[nport].start =

				    simple_strtoul(buf, &buf, 0);

				res = &dev->res.port_resource[nport];

				res->start = simple_strtoul(buf, &buf, 0);

				while (isspace(*buf))

					++buf;

				if (*buf == '-') {

					buf += 1;

					while (isspace(*buf))

						++buf;

					dev->res.port_resource[nport].end =

					    simple_strtoul(buf, &buf, 0);

					res->end = simple_strtoul(buf, &buf, 0);

				} else

					dev->res.port_resource[nport].end =

					    dev->res.port_resource[nport].start;

				dev->res.port_resource[nport].flags =

				    IORESOURCE_IO;

					res->end = res->start;

				res->flags = IORESOURCE_IO;

				nport++;

				if (nport >= PNP_MAX_PORT)

					break;
@@ -406,21 +404,18 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr, 
				buf += 3;

				while (isspace(*buf))

					++buf;

				dev->res.mem_resource[nmem].start =

				    simple_strtoul(buf, &buf, 0);

				res = &dev->res.mem_resource[nmem];

				res->start = simple_strtoul(buf, &buf, 0);

				while (isspace(*buf))

					++buf;

				if (*buf == '-') {

					buf += 1;

					while (isspace(*buf))

						++buf;

					dev->res.mem_resource[nmem].end =

					    simple_strtoul(buf, &buf, 0);

					res->end = simple_strtoul(buf, &buf, 0);

				} else

					dev->res.mem_resource[nmem].end =

					    dev->res.mem_resource[nmem].start;

				dev->res.mem_resource[nmem].flags =

				    IORESOURCE_MEM;

					res->end = res->start;

				res->flags = IORESOURCE_MEM;

				nmem++;

				if (nmem >= PNP_MAX_MEM)

					break;
@@ -430,11 +425,10 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr, 
				buf += 3;

				while (isspace(*buf))

					++buf;

				dev->res.irq_resource[nirq].start =

				    dev->res.irq_resource[nirq].end =

				res = &dev->res.irq_resource[nirq];

				res->start = res->end =

				    simple_strtoul(buf, &buf, 0);

				dev->res.irq_resource[nirq].flags =

				    IORESOURCE_IRQ;

				res->flags = IORESOURCE_IRQ;

				nirq++;

				if (nirq >= PNP_MAX_IRQ)

					break;
@@ -444,11 +438,10 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr, 
				buf += 3;

				while (isspace(*buf))

					++buf;

				dev->res.dma_resource[ndma].start =

				    dev->res.dma_resource[ndma].end =

				res = &dev->res.dma_resource[ndma];

				res->start = res->end =

				    simple_strtoul(buf, &buf, 0);

				dev->res.dma_resource[ndma].flags =

				    IORESOURCE_DMA;

				res->flags = IORESOURCE_DMA;

				ndma++;

				if (ndma >= PNP_MAX_DMA)

					break;