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 18/55] PNP: remove pnp_resource_table from internal get/set interfaces
Date: Mon, 28 Apr 2008 16:34:05 -0600 [thread overview]
Message-ID: <20080428223620.118015602@ldl.fc.hp.com> (raw)
In-Reply-To: 20080428223347.233593713@ldl.fc.hp.com
[-- Attachment #1: pnp-remove-pnp_resource_table-args-from-get-set --]
[-- Type: text/plain, Size: 5442 bytes --]
When we call protocol->get() and protocol->set() methods, we currently
supply pointers to both the pnp_dev and the pnp_resource_table even
though the pnp_resource_table should always be the one associated with
the pnp_dev.
This removes the pnp_resource_table arguments to make it clear that
these methods only operate on the specified pnp_dev.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
---
include/linux/pnp.h | 4 ++--
drivers/pnp/interface.c | 2 +-
drivers/pnp/manager.c | 2 +-
drivers/pnp/isapnp/core.c | 11 +++++------
drivers/pnp/pnpacpi/core.c | 8 +++-----
drivers/pnp/pnpbios/core.c | 10 ++++------
6 files changed, 16 insertions(+), 21 deletions(-)
Index: work10/include/linux/pnp.h
===================================================================
--- work10.orig/include/linux/pnp.h 2008-04-28 16:09:19.000000000 -0600
+++ work10/include/linux/pnp.h 2008-04-28 16:09:19.000000000 -0600
@@ -328,8 +328,8 @@
char *name;
/* resource control functions */
- int (*get) (struct pnp_dev *dev, struct pnp_resource_table *res);
- int (*set) (struct pnp_dev *dev, struct pnp_resource_table *res);
+ int (*get) (struct pnp_dev *dev);
+ int (*set) (struct pnp_dev *dev);
int (*disable) (struct pnp_dev *dev);
/* protocol specific suspend/resume */
Index: work10/drivers/pnp/interface.c
===================================================================
--- work10.orig/drivers/pnp/interface.c 2008-04-28 15:57:03.000000000 -0600
+++ work10/drivers/pnp/interface.c 2008-04-28 16:09:19.000000000 -0600
@@ -364,7 +364,7 @@
if (!strnicmp(buf, "get", 3)) {
mutex_lock(&pnp_res_mutex);
if (pnp_can_read(dev))
- dev->protocol->get(dev, &dev->res);
+ dev->protocol->get(dev);
mutex_unlock(&pnp_res_mutex);
goto done;
}
Index: work10/drivers/pnp/manager.c
===================================================================
--- work10.orig/drivers/pnp/manager.c 2008-04-28 15:57:03.000000000 -0600
+++ work10/drivers/pnp/manager.c 2008-04-28 16:09:19.000000000 -0600
@@ -473,7 +473,7 @@
return -EINVAL;
}
- if (dev->protocol->set(dev, &dev->res) < 0) {
+ if (dev->protocol->set(dev) < 0) {
dev_err(&dev->dev, "activation failed\n");
return -EIO;
}
Index: work10/drivers/pnp/isapnp/core.c
===================================================================
--- work10.orig/drivers/pnp/isapnp/core.c 2008-04-28 16:09:19.000000000 -0600
+++ work10/drivers/pnp/isapnp/core.c 2008-04-28 16:09:19.000000000 -0600
@@ -976,21 +976,20 @@
return 0;
}
-static int isapnp_get_resources(struct pnp_dev *dev,
- struct pnp_resource_table *res)
+static int isapnp_get_resources(struct pnp_dev *dev)
{
int ret;
- pnp_init_resource_table(res);
+ pnp_init_resource_table(&dev->res);
isapnp_cfg_begin(dev->card->number, dev->number);
- ret = isapnp_read_resources(dev, res);
+ ret = isapnp_read_resources(dev, &dev->res);
isapnp_cfg_end();
return ret;
}
-static int isapnp_set_resources(struct pnp_dev *dev,
- struct pnp_resource_table *res)
+static int isapnp_set_resources(struct pnp_dev *dev)
{
+ struct pnp_resource_table *res = &dev->res;
int tmp;
isapnp_cfg_begin(dev->card->number, dev->number);
Index: work10/drivers/pnp/pnpacpi/core.c
===================================================================
--- work10.orig/drivers/pnp/pnpacpi/core.c 2008-04-28 16:09:18.000000000 -0600
+++ work10/drivers/pnp/pnpacpi/core.c 2008-04-28 16:09:19.000000000 -0600
@@ -73,8 +73,7 @@
return 1;
}
-static int pnpacpi_get_resources(struct pnp_dev *dev,
- struct pnp_resource_table *res)
+static int pnpacpi_get_resources(struct pnp_dev *dev)
{
acpi_status status;
@@ -83,8 +82,7 @@
return ACPI_FAILURE(status) ? -ENODEV : 0;
}
-static int pnpacpi_set_resources(struct pnp_dev *dev,
- struct pnp_resource_table *res)
+static int pnpacpi_set_resources(struct pnp_dev *dev)
{
acpi_handle handle = dev->data;
struct acpi_buffer buffer;
@@ -94,7 +92,7 @@
ret = pnpacpi_build_resource_template(dev, &buffer);
if (ret)
return ret;
- ret = pnpacpi_encode_resources(res, &buffer);
+ ret = pnpacpi_encode_resources(&dev->res, &buffer);
if (ret) {
kfree(buffer.pointer);
return ret;
Index: work10/drivers/pnp/pnpbios/core.c
===================================================================
--- work10.orig/drivers/pnp/pnpbios/core.c 2008-04-28 16:09:12.000000000 -0600
+++ work10/drivers/pnp/pnpbios/core.c 2008-04-28 16:09:19.000000000 -0600
@@ -204,8 +204,7 @@
#endif /* CONFIG_HOTPLUG */
-static int pnpbios_get_resources(struct pnp_dev *dev,
- struct pnp_resource_table *res)
+static int pnpbios_get_resources(struct pnp_dev *dev)
{
u8 nodenum = dev->number;
struct pnp_bios_node *node;
@@ -220,14 +219,13 @@
kfree(node);
return -ENODEV;
}
- pnpbios_read_resources_from_node(res, node);
+ pnpbios_read_resources_from_node(&dev->res, node);
dev->active = pnp_is_active(dev);
kfree(node);
return 0;
}
-static int pnpbios_set_resources(struct pnp_dev *dev,
- struct pnp_resource_table *res)
+static int pnpbios_set_resources(struct pnp_dev *dev)
{
u8 nodenum = dev->number;
struct pnp_bios_node *node;
@@ -243,7 +241,7 @@
kfree(node);
return -ENODEV;
}
- if (pnpbios_write_resources_to_node(res, node) < 0) {
+ if (pnpbios_write_resources_to_node(&dev->res, node) < 0) {
kfree(node);
return -1;
}
--
next prev parent reply other threads:[~2008-04-28 22:36 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 ` Bjorn Helgaas [this message]
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 ` [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=20080428223620.118015602@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