From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Li Shaohua <shaohua.li@intel.com>
Cc: Matthieu Castet <castet.matthieu@free.fr>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Rene Herman <rene.herman@keyaccess.nl>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Subject: [patch 36/53] PNP: add struct pnp_resource
Date: Fri, 18 Apr 2008 14:50:31 -0600 [thread overview]
Message-ID: <20080418205054.510966149@ldl.fc.hp.com> (raw)
In-Reply-To: 20080418204955.342963315@ldl.fc.hp.com
[-- Attachment #1: pnp-add-struct-pnp_resource --]
[-- Type: text/plain, Size: 7016 bytes --]
This struct currently contains only a struct resource, but we will
soon need additional PNP-specific information.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
drivers/pnp/base.h | 12 ++++++++----
drivers/pnp/isapnp/core.c | 26 ++++++++++++++++++--------
drivers/pnp/pnpacpi/rsparser.c | 8 ++++----
drivers/pnp/pnpbios/rsparser.c | 8 ++++----
drivers/pnp/resource.c | 8 ++++----
5 files changed, 38 insertions(+), 24 deletions(-)
Index: work8/drivers/pnp/base.h
===================================================================
--- work8.orig/drivers/pnp/base.h 2008-04-17 14:57:25.000000000 -0600
+++ work8/drivers/pnp/base.h 2008-04-17 15:04:41.000000000 -0600
@@ -24,9 +24,13 @@
#define PNP_MAX_IRQ 2
#define PNP_MAX_DMA 2
+struct pnp_resource {
+ struct resource res;
+};
+
struct pnp_resource_table {
- struct resource port_resource[PNP_MAX_PORT];
- struct resource mem_resource[PNP_MAX_MEM];
- struct resource dma_resource[PNP_MAX_DMA];
- struct resource irq_resource[PNP_MAX_IRQ];
+ struct pnp_resource port[PNP_MAX_PORT];
+ struct pnp_resource mem[PNP_MAX_MEM];
+ struct pnp_resource dma[PNP_MAX_DMA];
+ struct pnp_resource irq[PNP_MAX_IRQ];
};
Index: work8/drivers/pnp/isapnp/core.c
===================================================================
--- work8.orig/drivers/pnp/isapnp/core.c 2008-04-17 15:02:30.000000000 -0600
+++ work8/drivers/pnp/isapnp/core.c 2008-04-17 15:04:41.000000000 -0600
@@ -923,6 +923,7 @@
static int isapnp_read_resources(struct pnp_dev *dev)
{
+ struct pnp_resource *pnp_res;
struct resource *res;
int tmp, ret;
@@ -932,7 +933,8 @@
ret = isapnp_read_word(ISAPNP_CFG_PORT + (tmp << 1));
if (!ret)
continue;
- res = &dev->res->port_resource[tmp];
+ pnp_res = &dev->res->port[tmp];
+ res = &pnp_res->res;
res->start = ret;
res->flags = IORESOURCE_IO;
}
@@ -941,7 +943,8 @@
isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
if (!ret)
continue;
- res = &dev->res->mem_resource[tmp];
+ pnp_res = &dev->res->mem[tmp];
+ res = &pnp_res->res;
res->start = ret;
res->flags = IORESOURCE_MEM;
}
@@ -951,7 +954,8 @@
8);
if (!ret)
continue;
- res = &dev->res->irq_resource[tmp];
+ pnp_res = &dev->res->irq[tmp];
+ res = &pnp_res->res;
res->start = res->end = ret;
res->flags = IORESOURCE_IRQ;
}
@@ -959,7 +963,8 @@
ret = isapnp_read_byte(ISAPNP_CFG_DMA + tmp);
if (ret == 4)
continue;
- res = &dev->res->dma_resource[tmp];
+ pnp_res = &dev->res->dma[tmp];
+ res = &pnp_res->res;
res->start = res->end = ret;
res->flags = IORESOURCE_DMA;
}
@@ -980,20 +985,23 @@
static int isapnp_set_resources(struct pnp_dev *dev)
{
+ struct pnp_resource *pnp_res;
struct resource *res;
int tmp;
isapnp_cfg_begin(dev->card->number, dev->number);
dev->active = 1;
for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) {
- res = &dev->res->port_resource[tmp];
+ pnp_res = &dev->res->port[tmp];
+ res = &pnp_res->res;
if ((res->flags & (IORESOURCE_IO | IORESOURCE_UNSET)) ==
IORESOURCE_IO)
isapnp_write_word(ISAPNP_CFG_PORT + (tmp << 1),
res->start);
}
for (tmp = 0; tmp < ISAPNP_MAX_IRQ; tmp++) {
- res = &dev->res->irq_resource[tmp];
+ pnp_res = &dev->res->irq[tmp];
+ res = &pnp_res->res;
if ((res->flags & (IORESOURCE_IRQ | IORESOURCE_UNSET)) ==
IORESOURCE_IRQ) {
int irq = res->start;
@@ -1003,13 +1011,15 @@
}
}
for (tmp = 0; tmp < ISAPNP_MAX_DMA; tmp++) {
- res = &dev->res->dma_resource[tmp];
+ pnp_res = &dev->res->dma[tmp];
+ res = &pnp_res->res;
if ((res->flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) ==
IORESOURCE_DMA)
isapnp_write_byte(ISAPNP_CFG_DMA + tmp, res->start);
}
for (tmp = 0; tmp < ISAPNP_MAX_MEM; tmp++) {
- res = &dev->res->mem_resource[tmp];
+ pnp_res = &dev->res->mem[tmp];
+ res = &pnp_res->res;
if ((res->flags & (IORESOURCE_MEM | IORESOURCE_UNSET)) ==
IORESOURCE_MEM)
isapnp_write_word(ISAPNP_CFG_MEM + (tmp << 3),
Index: work8/drivers/pnp/pnpacpi/rsparser.c
===================================================================
--- work8.orig/drivers/pnp/pnpacpi/rsparser.c 2008-04-17 15:02:30.000000000 -0600
+++ work8/drivers/pnp/pnpacpi/rsparser.c 2008-04-17 15:04:41.000000000 -0600
@@ -92,7 +92,7 @@
return;
for (i = 0; i < PNP_MAX_IRQ; i++) {
- res = &dev->res->irq_resource[i];
+ res = &dev->res->irq[i].res;
if (res->flags & IORESOURCE_UNSET)
break;
}
@@ -183,7 +183,7 @@
static unsigned char warned;
for (i = 0; i < PNP_MAX_DMA; i++) {
- res = &dev->res->dma_resource[i];
+ res = &dev->res->dma[i].res;
if (res->flags & IORESOURCE_UNSET)
break;
}
@@ -211,7 +211,7 @@
static unsigned char warned;
for (i = 0; i < PNP_MAX_PORT; i++) {
- res = &dev->res->port_resource[i];
+ res = &dev->res->port[i].res;
if (res->flags & IORESOURCE_UNSET)
break;
}
@@ -241,7 +241,7 @@
static unsigned char warned;
for (i = 0; i < PNP_MAX_MEM; i++) {
- res = &dev->res->mem_resource[i];
+ res = &dev->res->mem[i].res;
if (res->flags & IORESOURCE_UNSET)
break;
}
Index: work8/drivers/pnp/pnpbios/rsparser.c
===================================================================
--- work8.orig/drivers/pnp/pnpbios/rsparser.c 2008-04-17 15:02:30.000000000 -0600
+++ work8/drivers/pnp/pnpbios/rsparser.c 2008-04-17 15:04:41.000000000 -0600
@@ -60,7 +60,7 @@
int i;
for (i = 0; i < PNP_MAX_IRQ; i++) {
- res = &dev->res->irq_resource[i];
+ res = &dev->res->irq[i].res;
if (res->flags & IORESOURCE_UNSET)
break;
}
@@ -82,7 +82,7 @@
int i;
for (i = 0; i < PNP_MAX_DMA; i++) {
- res = &dev->res->dma_resource[i];
+ res = &dev->res->dma[i].res;
if (res->flags & IORESOURCE_UNSET)
break;
}
@@ -104,7 +104,7 @@
int i;
for (i = 0; i < PNP_MAX_PORT; i++) {
- res = &dev->res->port_resource[i];
+ res = &dev->res->port[i].res;
if (res->flags & IORESOURCE_UNSET)
break;
}
@@ -127,7 +127,7 @@
int i;
for (i = 0; i < PNP_MAX_MEM; i++) {
- res = &dev->res->mem_resource[i];
+ res = &dev->res->mem[i].res;
if (res->flags & IORESOURCE_UNSET)
break;
}
Index: work8/drivers/pnp/resource.c
===================================================================
--- work8.orig/drivers/pnp/resource.c 2008-04-17 14:57:25.000000000 -0600
+++ work8/drivers/pnp/resource.c 2008-04-17 15:04:41.000000000 -0600
@@ -498,19 +498,19 @@
case IORESOURCE_IO:
if (num >= PNP_MAX_PORT)
return NULL;
- return &res->port_resource[num];
+ return &res->port[num].res;
case IORESOURCE_MEM:
if (num >= PNP_MAX_MEM)
return NULL;
- return &res->mem_resource[num];
+ return &res->mem[num].res;
case IORESOURCE_IRQ:
if (num >= PNP_MAX_IRQ)
return NULL;
- return &res->irq_resource[num];
+ return &res->irq[num].res;
case IORESOURCE_DMA:
if (num >= PNP_MAX_DMA)
return NULL;
- return &res->dma_resource[num];
+ return &res->dma[num].res;
}
return NULL;
}
--
next prev parent reply other threads:[~2008-04-18 21:05 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-18 20:49 [patch 00/53] PNP cleanup and convert to dynamic resources, v3 Bjorn Helgaas
2008-04-18 20:49 ` [patch 01/53] ISAPNP: move config register addresses out of isapnp.h Bjorn Helgaas
2008-04-18 20:49 ` [patch 02/53] PNPACPI: continue after _CRS and _PRS errors Bjorn Helgaas
2008-04-18 20:49 ` [patch 03/53] PNP: make pnp_add_id() internal to PNP core Bjorn Helgaas
2008-04-18 20:49 ` [patch 04/53] PNP: change pnp_add_id() to allocate its own pnp_id structures Bjorn Helgaas
2008-04-18 20:50 ` [patch 05/53] PNP: add pnp_eisa_id_to_string() Bjorn Helgaas
2008-04-18 20:50 ` [patch 06/53] PNP: add pnp_alloc_dev() Bjorn Helgaas
2008-04-18 20:50 ` [patch 07/53] PNP: make pnp_add_card_id() internal to PNP core Bjorn Helgaas
2008-04-18 20:50 ` [patch 08/53] PNP: change pnp_add_card_id() to allocate its own pnp_id structures Bjorn Helgaas
2008-04-18 20:50 ` [patch 09/53] ISAPNP: pull pnp_add_card_id() out of isapnp_parse_card_id() Bjorn Helgaas
2008-04-18 20:50 ` [patch 10/53] PNP: add pnp_alloc_card() Bjorn Helgaas
2008-04-18 20:50 ` [patch 11/53] PNPACPI: pnpacpi_encode_ext_irq() wrongly set "irq" instead of "extended_irq" Bjorn Helgaas
2008-04-18 20:50 ` [patch 12/53] PNPACPI: use temporaries to reduce repetition Bjorn Helgaas
2008-04-18 20:50 ` [patch 13/53] PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() Bjorn Helgaas
2008-04-18 20:50 ` [patch 14/53] PNPACPI: extend irq_flags() to set IORESOURCE_IRQ_SHAREABLE when appropriate Bjorn Helgaas
2008-04-18 20:50 ` [patch 15/53] PNPACPI: pass pnp_dev instead of acpi_handle Bjorn Helgaas
2008-04-18 20:50 ` [patch 16/53] PNP: remove pnp_resource_table from internal get/set interfaces Bjorn Helgaas
2008-04-18 20:50 ` [patch 17/53] PNP: remove more pnp_resource_table arguments Bjorn Helgaas
2008-04-18 20:50 ` [patch 18/53] PNP: add pnp_init_resources(struct pnp_dev *) interface Bjorn Helgaas
2008-04-18 20:50 ` [patch 19/53] PNP: remove pnp_resource_table from internal pnp_clean_resource_table interface Bjorn Helgaas
2008-04-18 20:50 ` [patch 20/53] PNP: remove unused interfaces using pnp_resource_table Bjorn Helgaas
2008-04-18 20:50 ` [patch 21/53] PNP: use dev_printk when possible Bjorn Helgaas
2008-04-18 20:50 ` [patch 22/53] PNP: factor pnp_init_resource_table() and pnp_clean_resource_table() Bjorn Helgaas
2008-04-18 22:29 ` Rene Herman
2008-04-19 3:57 ` Bjorn Helgaas
2008-04-19 4:43 ` Rene Herman
2008-04-19 4:46 ` Rene Herman
2008-04-21 18:41 ` Rene Herman
2008-04-21 23:10 ` Bjorn Helgaas
2008-04-22 21:01 ` Rene Herman
2008-04-23 23:08 ` Bjorn Helgaas
2008-04-24 1:26 ` Rene Herman
2008-04-24 1:39 ` Rene Herman
2008-04-24 22:45 ` Bjorn Helgaas
2008-04-18 20:50 ` [patch 23/53] PNP: add pnp_get_resource() interface Bjorn Helgaas
2008-04-18 20:50 ` [patch 24/53] PNP: remove pnp_mem_flags() as an lvalue Bjorn Helgaas
2008-04-18 20:50 ` [patch 25/53] PNP: convert resource accessors to use pnp_get_resource(), not pnp_resource_table Bjorn Helgaas
2008-04-18 20:50 ` [patch 26/53] PNP: use conventional "i" for loop indices Bjorn Helgaas
2008-04-18 20:50 ` [patch 27/53] PNP: convert resource checks to use pnp_get_resource(), not pnp_resource_table Bjorn Helgaas
2008-04-18 20:50 ` [patch 28/53] PNP: convert resource assign functions " Bjorn Helgaas
2008-04-18 20:50 ` [patch 29/53] PNP: convert sysfs interface " Bjorn Helgaas
2008-04-18 20:50 ` [patch 30/53] PNP: convert resource initializers " Bjorn Helgaas
2008-04-18 20:50 ` [patch 31/53] PNP: convert encoders " Bjorn Helgaas
2008-04-18 20:50 ` [patch 32/53] PNP: remove PNP_MAX_* uses Bjorn Helgaas
2008-04-18 20:50 ` [patch 33/53] rtc: dont reference pnp_resource_table directly Bjorn Helgaas
2008-04-18 20:50 ` [patch 34/53] PNP: make pnp_resource_table private to PNP core Bjorn Helgaas
2008-04-18 20:50 ` [patch 35/53] PNP: remove pnp_resource_table references from resource decoders Bjorn Helgaas
2008-04-18 20:50 ` Bjorn Helgaas [this message]
2008-04-18 20:50 ` [patch 37/53] PNP: add pnp_resource index for ISAPNP Bjorn Helgaas
2008-04-18 20:50 ` [patch 38/53] PNP: add pnp_new_resource() to find a new unset pnp_resource Bjorn Helgaas
2008-04-18 20:50 ` [patch 39/53] PNP: make generic pnp_add_irq_resource() Bjorn Helgaas
2008-04-18 20:50 ` [patch 40/53] PNP: make generic pnp_add_dma_resource() Bjorn Helgaas
2008-04-18 20:50 ` [patch 41/53] PNP: make generic pnp_add_io_resource() Bjorn Helgaas
2008-04-18 20:50 ` [patch 42/53] PNP: make generic pnp_add_mem_resource() Bjorn Helgaas
2008-04-18 20:50 ` [patch 43/53] ISAPNP: fold isapnp_read_resources() back into isapnp_get_resources() Bjorn Helgaas
2008-04-18 20:50 ` [patch 44/53] PNP: add pnp_resource_type() internal interface Bjorn Helgaas
2008-04-18 20:50 ` [patch 45/53] PNP: replace pnp_resource_table with dynamically allocated resources Bjorn Helgaas
2008-04-18 20:50 ` [patch 46/53] PNP: remove ratelimit on add resource failures Bjorn Helgaas
2008-04-18 20:50 ` [patch 47/53] PNPACPI: move _CRS/_PRS warnings closer to the action Bjorn Helgaas
2008-04-18 20:50 ` [patch 48/53] PNPACPI: remove some pnp_dbg calls Bjorn Helgaas
2008-04-18 20:50 ` [patch 49/53] PNP: make interfaces private to the PNP core Bjorn Helgaas
2008-04-18 20:50 ` [patch 50/53] ISAPNP: remove unused pnp_dev->regs field Bjorn Helgaas
2008-04-18 20:50 ` [patch 51/53] PNPBIOS: remove include/linux/pnpbios.h Bjorn Helgaas
2008-04-18 20:50 ` [patch 52/53] PNP: fill in generic pnp_dev fields earlier Bjorn Helgaas
2008-04-18 20:50 ` [patch 53/53] PNP: dont sort by type in /sys/.../resources Bjorn Helgaas
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=20080418205054.510966149@ldl.fc.hp.com \
--to=bjorn.helgaas@hp.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
/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