From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org, Rene Herman <rene.herman@gmail.com>,
linux-kernel@vger.kernel.org, Adam Belay <ambx1@neo.rr.com>,
Adam M Belay <abelay@mit.edu>, Li Shaohua <shaohua.li@intel.com>,
Matthieu Castet <castet.matthieu@free.fr>,
Thomas Renninger <trenn@suse.de>,
Rene Herman <rene.herman@keyaccess.nl>,
Jaroslav Kysela <perex@perex.cz>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [patch 31/55] PNP: reduce redundancy in pnp_assign_port() and others
Date: Mon, 28 Apr 2008 16:34:18 -0600 [thread overview]
Message-ID: <20080428223622.817032321@ldl.fc.hp.com> (raw)
In-Reply-To: 20080428223347.233593713@ldl.fc.hp.com
[-- Attachment #1: pnp-simplify-assign-functions --]
[-- Type: text/plain, Size: 8587 bytes --]
Use a temporary "res" pointer to replace repeated lookups in
the pnp resource tables.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
---
drivers/pnp/manager.c | 108 ++++++++++++++++++++++----------------------------
1 file changed, 48 insertions(+), 60 deletions(-)
Index: work10/drivers/pnp/manager.c
===================================================================
--- work10.orig/drivers/pnp/manager.c 2008-04-28 16:09:25.000000000 -0600
+++ work10/drivers/pnp/manager.c 2008-04-28 16:09:31.000000000 -0600
@@ -19,8 +19,7 @@
static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
{
- resource_size_t *start, *end;
- unsigned long *flags;
+ struct resource *res;
if (idx >= PNP_MAX_PORT) {
dev_err(&dev->dev, "too many I/O port resources\n");
@@ -28,49 +27,46 @@
return 1;
}
- start = &dev->res.port_resource[idx].start;
- end = &dev->res.port_resource[idx].end;
- flags = &dev->res.port_resource[idx].flags;
+ res = &dev->res.port_resource[idx];
/* check if this resource has been manually set, if so skip */
- if (!(dev->res.port_resource[idx].flags & IORESOURCE_AUTO)) {
+ if (!(res->flags & IORESOURCE_AUTO)) {
dev_dbg(&dev->dev, " io %d already set to %#llx-%#llx "
- "flags %#lx\n", idx, (unsigned long long) *start,
- (unsigned long long) *end, *flags);
+ "flags %#lx\n", idx, (unsigned long long) res->start,
+ (unsigned long long) res->end, res->flags);
return 1;
}
/* set the initial values */
- *flags |= rule->flags | IORESOURCE_IO;
- *flags &= ~IORESOURCE_UNSET;
+ res->flags |= rule->flags | IORESOURCE_IO;
+ res->flags &= ~IORESOURCE_UNSET;
if (!rule->size) {
- *flags |= IORESOURCE_DISABLED;
+ res->flags |= IORESOURCE_DISABLED;
dev_dbg(&dev->dev, " io %d disabled\n", idx);
return 1; /* skip disabled resource requests */
}
- *start = rule->min;
- *end = *start + rule->size - 1;
+ res->start = rule->min;
+ res->end = res->start + rule->size - 1;
/* run through until pnp_check_port is happy */
while (!pnp_check_port(dev, idx)) {
- *start += rule->align;
- *end = *start + rule->size - 1;
- if (*start > rule->max || !rule->align) {
+ res->start += rule->align;
+ res->end = res->start + rule->size - 1;
+ if (res->start > rule->max || !rule->align) {
dev_dbg(&dev->dev, " couldn't assign io %d\n", idx);
return 0;
}
}
dev_dbg(&dev->dev, " assign io %d %#llx-%#llx\n", idx,
- (unsigned long long) *start, (unsigned long long) *end);
+ (unsigned long long) res->start, (unsigned long long) res->end);
return 1;
}
static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
{
- resource_size_t *start, *end;
- unsigned long *flags;
+ struct resource *res;
if (idx >= PNP_MAX_MEM) {
dev_err(&dev->dev, "too many memory resources\n");
@@ -78,59 +74,56 @@
return 1;
}
- start = &dev->res.mem_resource[idx].start;
- end = &dev->res.mem_resource[idx].end;
- flags = &dev->res.mem_resource[idx].flags;
+ res = &dev->res.mem_resource[idx];
/* check if this resource has been manually set, if so skip */
- if (!(dev->res.mem_resource[idx].flags & IORESOURCE_AUTO)) {
+ if (!(res->flags & IORESOURCE_AUTO)) {
dev_dbg(&dev->dev, " mem %d already set to %#llx-%#llx "
- "flags %#lx\n", idx, (unsigned long long) *start,
- (unsigned long long) *end, *flags);
+ "flags %#lx\n", idx, (unsigned long long) res->start,
+ (unsigned long long) res->end, res->flags);
return 1;
}
/* set the initial values */
- *flags |= rule->flags | IORESOURCE_MEM;
- *flags &= ~IORESOURCE_UNSET;
+ res->flags |= rule->flags | IORESOURCE_MEM;
+ res->flags &= ~IORESOURCE_UNSET;
/* convert pnp flags to standard Linux flags */
if (!(rule->flags & IORESOURCE_MEM_WRITEABLE))
- *flags |= IORESOURCE_READONLY;
+ res->flags |= IORESOURCE_READONLY;
if (rule->flags & IORESOURCE_MEM_CACHEABLE)
- *flags |= IORESOURCE_CACHEABLE;
+ res->flags |= IORESOURCE_CACHEABLE;
if (rule->flags & IORESOURCE_MEM_RANGELENGTH)
- *flags |= IORESOURCE_RANGELENGTH;
+ res->flags |= IORESOURCE_RANGELENGTH;
if (rule->flags & IORESOURCE_MEM_SHADOWABLE)
- *flags |= IORESOURCE_SHADOWABLE;
+ res->flags |= IORESOURCE_SHADOWABLE;
if (!rule->size) {
- *flags |= IORESOURCE_DISABLED;
+ res->flags |= IORESOURCE_DISABLED;
dev_dbg(&dev->dev, " mem %d disabled\n", idx);
return 1; /* skip disabled resource requests */
}
- *start = rule->min;
- *end = *start + rule->size - 1;
+ res->start = rule->min;
+ res->end = res->start + rule->size - 1;
/* run through until pnp_check_mem is happy */
while (!pnp_check_mem(dev, idx)) {
- *start += rule->align;
- *end = *start + rule->size - 1;
- if (*start > rule->max || !rule->align) {
+ res->start += rule->align;
+ res->end = res->start + rule->size - 1;
+ if (res->start > rule->max || !rule->align) {
dev_dbg(&dev->dev, " couldn't assign mem %d\n", idx);
return 0;
}
}
dev_dbg(&dev->dev, " assign mem %d %#llx-%#llx\n", idx,
- (unsigned long long) *start, (unsigned long long) *end);
+ (unsigned long long) res->start, (unsigned long long) res->end);
return 1;
}
static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
{
- resource_size_t *start, *end;
- unsigned long *flags;
+ struct resource *res;
int i;
/* IRQ priority: this table is good for i386 */
@@ -144,40 +137,39 @@
return 1;
}
- start = &dev->res.irq_resource[idx].start;
- end = &dev->res.irq_resource[idx].end;
- flags = &dev->res.irq_resource[idx].flags;
+ res = &dev->res.irq_resource[idx];
/* check if this resource has been manually set, if so skip */
- if (!(dev->res.irq_resource[idx].flags & IORESOURCE_AUTO)) {
+ if (!(res->flags & IORESOURCE_AUTO)) {
dev_dbg(&dev->dev, " irq %d already set to %d flags %#lx\n",
- idx, (int) *start, *flags);
+ idx, (int) res->start, res->flags);
return 1;
}
/* set the initial values */
- *flags |= rule->flags | IORESOURCE_IRQ;
- *flags &= ~IORESOURCE_UNSET;
+ res->flags |= rule->flags | IORESOURCE_IRQ;
+ res->flags &= ~IORESOURCE_UNSET;
if (bitmap_empty(rule->map, PNP_IRQ_NR)) {
- *flags |= IORESOURCE_DISABLED;
+ res->flags |= IORESOURCE_DISABLED;
dev_dbg(&dev->dev, " irq %d disabled\n", idx);
return 1; /* skip disabled resource requests */
}
/* TBD: need check for >16 IRQ */
- *start = find_next_bit(rule->map, PNP_IRQ_NR, 16);
- if (*start < PNP_IRQ_NR) {
- *end = *start;
- dev_dbg(&dev->dev, " assign irq %d %d\n", idx, (int) *start);
+ res->start = find_next_bit(rule->map, PNP_IRQ_NR, 16);
+ if (res->start < PNP_IRQ_NR) {
+ res->end = res->start;
+ dev_dbg(&dev->dev, " assign irq %d %d\n", idx,
+ (int) res->start);
return 1;
}
for (i = 0; i < 16; i++) {
if (test_bit(xtab[i], rule->map)) {
- *start = *end = xtab[i];
+ res->start = res->end = xtab[i];
if (pnp_check_irq(dev, idx)) {
dev_dbg(&dev->dev, " assign irq %d %d\n", idx,
- (int) *start);
+ (int) res->start);
return 1;
}
}
@@ -188,8 +180,7 @@
static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
{
- resource_size_t *start, *end;
- unsigned long *flags;
+ struct resource *res;
int i;
/* DMA priority: this table is good for i386 */
@@ -202,35 +193,33 @@
return;
}
- start = &dev->res.dma_resource[idx].start;
- end = &dev->res.dma_resource[idx].end;
- flags = &dev->res.dma_resource[idx].flags;
+ res = &dev->res.dma_resource[idx];
/* check if this resource has been manually set, if so skip */
- if (!(dev->res.dma_resource[idx].flags & IORESOURCE_AUTO)) {
+ if (!(res->flags & IORESOURCE_AUTO)) {
dev_dbg(&dev->dev, " dma %d already set to %d flags %#lx\n",
- idx, (int) *start, *flags);
+ idx, (int) res->start, res->flags);
return;
}
/* set the initial values */
- *flags |= rule->flags | IORESOURCE_DMA;
- *flags &= ~IORESOURCE_UNSET;
+ res->flags |= rule->flags | IORESOURCE_DMA;
+ res->flags &= ~IORESOURCE_UNSET;
for (i = 0; i < 8; i++) {
if (rule->map & (1 << xtab[i])) {
- *start = *end = xtab[i];
+ res->start = res->end = xtab[i];
if (pnp_check_dma(dev, idx)) {
dev_dbg(&dev->dev, " assign dma %d %d\n", idx,
- (int) *start);
+ (int) res->start);
return;
}
}
}
#ifdef MAX_DMA_CHANNELS
- *start = *end = MAX_DMA_CHANNELS;
+ res->start = res->end = MAX_DMA_CHANNELS;
#endif
- *flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED;
+ res->flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED;
dev_dbg(&dev->dev, " disable dma %d\n", idx);
}
--
next prev parent reply other threads:[~2008-04-28 22:37 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-28 22:33 [patch 00/55] PNP cleanup, v5 Bjorn Helgaas
2008-04-28 22:33 ` [patch 01/55] PNP: turn on -DDEBUG when CONFIG_PNP_DEBUG is set Bjorn Helgaas
2008-04-28 22:33 ` [patch 02/55] ISAPNP: move config register addresses out of isapnp.h Bjorn Helgaas
2008-04-28 22:33 ` [patch 03/55] PNPACPI: continue after _CRS and _PRS errors Bjorn Helgaas
2008-04-28 22:33 ` [patch 04/55] PNP: make pnp_add_id() internal to PNP core Bjorn Helgaas
2008-04-28 22:33 ` [patch 05/55] PNP: change pnp_add_id() to allocate its own pnp_id structures Bjorn Helgaas
2008-04-28 22:33 ` [patch 06/55] PNP: add pnp_eisa_id_to_string() Bjorn Helgaas
2008-04-28 22:33 ` [patch 07/55] PNP: add pnp_alloc_dev() Bjorn Helgaas
2008-04-28 22:33 ` [patch 08/55] PNP: make pnp_add_card_id() internal to PNP core Bjorn Helgaas
2008-04-28 22:33 ` [patch 09/55] PNP: change pnp_add_card_id() to allocate its own pnp_id structures Bjorn Helgaas
2008-04-28 22:33 ` [patch 10/55] ISAPNP: pull pnp_add_card_id() out of isapnp_parse_card_id() Bjorn Helgaas
2008-04-28 22:33 ` [patch 11/55] PNP: add pnp_alloc_card() Bjorn Helgaas
2008-04-28 22:33 ` [patch 12/55] PNPACPI: pnpacpi_encode_ext_irq() wrongly set "irq" instead of "extended_irq" Bjorn Helgaas
2008-04-28 22:34 ` [patch 13/55] PNPACPI: use temporaries to reduce repetition Bjorn Helgaas
2008-04-28 22:34 ` [patch 14/55] PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() Bjorn Helgaas
2008-04-28 22:34 ` [patch 15/55] PNPACPI: extend irq_flags() to set IORESOURCE_IRQ_SHAREABLE when appropriate Bjorn Helgaas
2008-04-28 22:34 ` [patch 16/55] PNPACPI: pass pnp_dev instead of acpi_handle Bjorn Helgaas
2008-04-28 22:34 ` [patch 17/55] PNP: add debug output to option registration Bjorn Helgaas
2008-04-28 22:34 ` [patch 18/55] PNP: remove pnp_resource_table from internal get/set interfaces Bjorn Helgaas
2008-04-28 22:34 ` [patch 19/55] PNP: remove more pnp_resource_table arguments Bjorn Helgaas
2008-04-28 22:34 ` [patch 20/55] PNP: add debug output to encoders Bjorn Helgaas
2008-04-28 22:34 ` [patch 21/55] PNP: add debug when assigning PNP resources Bjorn Helgaas
2008-04-28 22:34 ` [patch 22/55] PNP: add pnp_init_resources(struct pnp_dev *) interface Bjorn Helgaas
2008-04-28 22:34 ` [patch 23/55] PNP: remove pnp_resource_table from internal pnp_clean_resource_table interface Bjorn Helgaas
2008-04-28 22:34 ` [patch 24/55] PNP: remove unused interfaces using pnp_resource_table Bjorn Helgaas
2008-04-28 22:34 ` [patch 25/55] PNP: use dev_printk when possible Bjorn Helgaas
2008-04-28 22:34 ` [patch 26/55] PNP: factor pnp_init_resource_table() and pnp_clean_resource_table() Bjorn Helgaas
2008-04-28 22:34 ` [patch 27/55] PNP: add pnp_get_resource() interface Bjorn Helgaas
2008-04-28 22:34 ` [patch 28/55] PNP: remove pnp_mem_flags() as an lvalue Bjorn Helgaas
2008-04-28 22:34 ` [patch 29/55] PNP: convert resource accessors to use pnp_get_resource(), not pnp_resource_table Bjorn Helgaas
2008-04-28 22:34 ` [patch 30/55] PNP: use conventional "i" for loop indices Bjorn Helgaas
2008-04-28 22:34 ` Bjorn Helgaas [this message]
2008-04-28 22:34 ` [patch 32/55] PNP: reduce redundancy in pnp_check_port() and others Bjorn Helgaas
2008-04-28 22:34 ` [patch 33/55] PNP: reduce redundancy in pnp_set_current_resources() Bjorn Helgaas
2008-04-28 22:34 ` [patch 34/55] PNP: check for conflicts with all resources, not just earlier ones Bjorn Helgaas
2008-04-28 22:34 ` [patch 35/55] PNP: pass resources, not indexes, to pnp_check_port(), et al Bjorn Helgaas
2008-04-28 22:34 ` [patch 36/55] PNP: convert resource checks to use pnp_get_resource(), not pnp_resource_table Bjorn Helgaas
2008-04-28 22:34 ` [patch 37/55] PNP: convert encoders " Bjorn Helgaas
2008-04-28 22:34 ` [patch 38/55] PNP: convert assign, interface " Bjorn Helgaas
2008-04-28 22:34 ` [patch 39/55] PNP: remove PNP_MAX_* uses Bjorn Helgaas
2008-04-28 22:34 ` [patch 40/55] rtc: dont reference pnp_resource_table directly Bjorn Helgaas
2008-04-28 22:34 ` [patch 41/55] PNP: make pnp_resource_table private to PNP core Bjorn Helgaas
2008-04-28 22:34 ` [patch 42/55] PNP: remove pnp_resource_table references from resource decoders Bjorn Helgaas
2008-04-28 22:34 ` [patch 43/55] PNP: add struct pnp_resource Bjorn Helgaas
2008-04-28 22:34 ` [patch 44/55] PNP: add pnp_get_pnp_resource() Bjorn Helgaas
2008-04-28 22:34 ` [patch 45/55] PNP: add pnp_resource index for ISAPNP Bjorn Helgaas
2008-04-28 22:34 ` [patch 46/55] PNP: add pnp_new_resource() to find a new unset pnp_resource Bjorn Helgaas
2008-04-28 22:34 ` [patch 47/55] PNP: make generic pnp_add_irq_resource() Bjorn Helgaas
2008-04-28 22:34 ` [patch 48/55] PNP: make generic pnp_add_dma_resource() Bjorn Helgaas
2008-04-28 22:34 ` [patch 49/55] PNP: make generic pnp_add_io_resource() Bjorn Helgaas
2008-04-28 22:34 ` [patch 50/55] PNP: make generic pnp_add_mem_resource() Bjorn Helgaas
2008-04-28 22:34 ` [patch 51/55] ISAPNP: fold isapnp_read_resources() back into isapnp_get_resources() Bjorn Helgaas
2008-04-28 22:34 ` [patch 52/55] PNPACPI: move _CRS/_PRS warnings closer to the action Bjorn Helgaas
2008-04-28 22:34 ` [patch 53/55] PNP: make interfaces private to the PNP core Bjorn Helgaas
2008-04-28 22:34 ` [patch 54/55] ISAPNP: remove unused pnp_dev->regs field Bjorn Helgaas
2008-04-28 22:34 ` [patch 55/55] PNPBIOS: remove include/linux/pnpbios.h Bjorn Helgaas
2008-04-29 8:38 ` [patch 00/55] PNP cleanup, v5 Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080428223622.817032321@ldl.fc.hp.com \
--to=bjorn.helgaas@hp.com \
--cc=abelay@mit.edu \
--cc=akpm@linux-foundation.org \
--cc=ambx1@neo.rr.com \
--cc=castet.matthieu@free.fr \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=rene.herman@gmail.com \
--cc=rene.herman@keyaccess.nl \
--cc=shaohua.li@intel.com \
--cc=trenn@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox