From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org, 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 41/55] PNP: make pnp_resource_table private to PNP core
Date: Mon, 28 Apr 2008 16:34:28 -0600 [thread overview]
Message-ID: <20080428223624.923080244@ldl.fc.hp.com> (raw)
In-Reply-To: 20080428223347.233593713@ldl.fc.hp.com
[-- Attachment #1: pnp-private-resource-table --]
[-- Type: text/plain, Size: 9281 bytes --]
There are no remaining references to the PNP_MAX_* constants or
the pnp_resource_table structure outside of the PNP core. Make
them private to the PNP core.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
drivers/pnp/base.h | 12 ++++++++++++
drivers/pnp/core.c | 8 ++++++++
drivers/pnp/isapnp/core.c | 4 ++--
drivers/pnp/manager.c | 16 ++++++++--------
drivers/pnp/pnpacpi/rsparser.c | 10 ++++++----
drivers/pnp/pnpbios/rsparser.c | 8 ++++----
drivers/pnp/resource.c | 2 +-
include/linux/pnp.h | 14 ++------------
8 files changed, 43 insertions(+), 31 deletions(-)
Index: work10/include/linux/pnp.h
===================================================================
--- work10.orig/include/linux/pnp.h 2008-04-28 16:09:30.000000000 -0600
+++ work10/include/linux/pnp.h 2008-04-28 16:09:41.000000000 -0600
@@ -13,14 +13,11 @@
#include <linux/errno.h>
#include <linux/mod_devicetable.h>
-#define PNP_MAX_PORT 40
-#define PNP_MAX_MEM 24
-#define PNP_MAX_IRQ 2
-#define PNP_MAX_DMA 2
#define PNP_NAME_LEN 50
struct pnp_protocol;
struct pnp_dev;
+struct pnp_resource_table;
/*
* Resource Management
@@ -184,13 +181,6 @@
struct pnp_option *next; /* used to chain dependent resources */
};
-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];
-};
-
/*
* Device Management
*/
@@ -260,7 +250,7 @@
int capabilities;
struct pnp_option *independent;
struct pnp_option *dependent;
- struct pnp_resource_table res;
+ struct pnp_resource_table *res;
char name[PNP_NAME_LEN]; /* contains a human-readable name */
unsigned short regs; /* ISAPnP: supported registers */
Index: work10/drivers/pnp/base.h
===================================================================
--- work10.orig/drivers/pnp/base.h 2008-04-28 16:09:34.000000000 -0600
+++ work10/drivers/pnp/base.h 2008-04-28 16:09:41.000000000 -0600
@@ -20,3 +20,15 @@
void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
void pnp_init_resource(struct resource *res);
+
+#define PNP_MAX_PORT 40
+#define PNP_MAX_MEM 24
+#define PNP_MAX_IRQ 2
+#define PNP_MAX_DMA 2
+
+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];
+};
Index: work10/drivers/pnp/core.c
===================================================================
--- work10.orig/drivers/pnp/core.c 2008-04-28 16:09:12.000000000 -0600
+++ work10/drivers/pnp/core.c 2008-04-28 16:09:41.000000000 -0600
@@ -106,6 +106,7 @@
pnp_free_option(dev->independent);
pnp_free_option(dev->dependent);
pnp_free_ids(dev);
+ kfree(dev->res);
kfree(dev);
}
@@ -118,6 +119,12 @@
if (!dev)
return NULL;
+ dev->res = kzalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
+ if (!dev->res) {
+ kfree(dev);
+ return NULL;
+ }
+
dev->protocol = protocol;
dev->number = id;
dev->dma_mask = DMA_24BIT_MASK;
@@ -133,6 +140,7 @@
dev_id = pnp_add_id(dev, pnpid);
if (!dev_id) {
+ kfree(dev->res);
kfree(dev);
return NULL;
}
Index: work10/drivers/pnp/isapnp/core.c
===================================================================
--- work10.orig/drivers/pnp/isapnp/core.c 2008-04-28 16:09:24.000000000 -0600
+++ work10/drivers/pnp/isapnp/core.c 2008-04-28 16:09:41.000000000 -0600
@@ -931,7 +931,7 @@
static int isapnp_read_resources(struct pnp_dev *dev)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int tmp, ret;
dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE);
@@ -987,7 +987,7 @@
static int isapnp_set_resources(struct pnp_dev *dev)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int tmp;
dev_dbg(&dev->dev, "set resources\n");
Index: work10/drivers/pnp/pnpacpi/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:35.000000000 -0600
+++ work10/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:41.000000000 -0600
@@ -21,6 +21,8 @@
#include <linux/kernel.h>
#include <linux/acpi.h>
#include <linux/pci.h>
+#include <linux/pnp.h>
+#include "../base.h"
#include "pnpacpi.h"
#ifdef CONFIG_IA64
@@ -80,7 +82,7 @@
u32 gsi, int triggering,
int polarity, int shareable)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int i = 0;
int irq;
int p, t;
@@ -176,7 +178,7 @@
static void pnpacpi_parse_allocated_dmaresource(struct pnp_dev *dev,
u32 dma, int flags)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int i = 0;
static unsigned char warned;
@@ -202,7 +204,7 @@
static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev,
u64 io, u64 len, int io_decode)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int i = 0;
static unsigned char warned;
@@ -230,7 +232,7 @@
u64 mem, u64 len,
int write_protect)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int i = 0;
static unsigned char warned;
Index: work10/drivers/pnp/pnpbios/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpbios/rsparser.c 2008-04-28 16:09:35.000000000 -0600
+++ work10/drivers/pnp/pnpbios/rsparser.c 2008-04-28 16:09:41.000000000 -0600
@@ -56,7 +56,7 @@
static void pnpbios_parse_allocated_irqresource(struct pnp_dev *dev, int irq)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int i = 0;
while (!(res->irq_resource[i].flags & IORESOURCE_UNSET)
@@ -76,7 +76,7 @@
static void pnpbios_parse_allocated_dmaresource(struct pnp_dev *dev, int dma)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int i = 0;
while (i < PNP_MAX_DMA &&
@@ -96,7 +96,7 @@
static void pnpbios_parse_allocated_ioresource(struct pnp_dev *dev,
int io, int len)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int i = 0;
while (!(res->port_resource[i].flags & IORESOURCE_UNSET)
@@ -116,7 +116,7 @@
static void pnpbios_parse_allocated_memresource(struct pnp_dev *dev,
int mem, int len)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
int i = 0;
while (!(res->mem_resource[i].flags & IORESOURCE_UNSET)
Index: work10/drivers/pnp/resource.c
===================================================================
--- work10.orig/drivers/pnp/resource.c 2008-04-28 16:09:37.000000000 -0600
+++ work10/drivers/pnp/resource.c 2008-04-28 16:09:41.000000000 -0600
@@ -502,7 +502,7 @@
struct resource *pnp_get_resource(struct pnp_dev *dev,
unsigned int type, unsigned int num)
{
- struct pnp_resource_table *res = &dev->res;
+ struct pnp_resource_table *res = dev->res;
switch (type) {
case IORESOURCE_IO:
Index: work10/drivers/pnp/manager.c
===================================================================
--- work10.orig/drivers/pnp/manager.c 2008-04-28 16:09:36.000000000 -0600
+++ work10/drivers/pnp/manager.c 2008-04-28 16:09:41.000000000 -0600
@@ -247,22 +247,22 @@
int idx;
for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
- res = &dev->res.irq_resource[idx];
+ res = &dev->res->irq_resource[idx];
res->flags = IORESOURCE_IRQ;
pnp_init_resource(res);
}
for (idx = 0; idx < PNP_MAX_DMA; idx++) {
- res = &dev->res.dma_resource[idx];
+ res = &dev->res->dma_resource[idx];
res->flags = IORESOURCE_DMA;
pnp_init_resource(res);
}
for (idx = 0; idx < PNP_MAX_PORT; idx++) {
- res = &dev->res.port_resource[idx];
+ res = &dev->res->port_resource[idx];
res->flags = IORESOURCE_IO;
pnp_init_resource(res);
}
for (idx = 0; idx < PNP_MAX_MEM; idx++) {
- res = &dev->res.mem_resource[idx];
+ res = &dev->res->mem_resource[idx];
res->flags = IORESOURCE_MEM;
pnp_init_resource(res);
}
@@ -278,28 +278,28 @@
int idx;
for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
- res = &dev->res.irq_resource[idx];
+ res = &dev->res->irq_resource[idx];
if (res->flags & IORESOURCE_AUTO) {
res->flags = IORESOURCE_IRQ;
pnp_init_resource(res);
}
}
for (idx = 0; idx < PNP_MAX_DMA; idx++) {
- res = &dev->res.dma_resource[idx];
+ res = &dev->res->dma_resource[idx];
if (res->flags & IORESOURCE_AUTO) {
res->flags = IORESOURCE_DMA;
pnp_init_resource(res);
}
}
for (idx = 0; idx < PNP_MAX_PORT; idx++) {
- res = &dev->res.port_resource[idx];
+ res = &dev->res->port_resource[idx];
if (res->flags & IORESOURCE_AUTO) {
res->flags = IORESOURCE_IO;
pnp_init_resource(res);
}
}
for (idx = 0; idx < PNP_MAX_MEM; idx++) {
- res = &dev->res.mem_resource[idx];
+ res = &dev->res->mem_resource[idx];
if (res->flags & IORESOURCE_AUTO) {
res->flags = IORESOURCE_MEM;
pnp_init_resource(res);
--
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 ` [patch 31/55] PNP: reduce redundancy in pnp_assign_port() and others Bjorn Helgaas
2008-04-28 22:34 ` [patch 32/55] PNP: reduce redundancy in pnp_check_port() " 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 ` Bjorn Helgaas [this message]
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=20080428223624.923080244@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@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