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>
Cc: linux-kernel@vger.kernel.org
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Adam M Belay <abelay@mit.edu>
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 52/54] PNP: make interfaces private to the PNP core
Date: Fri, 25 Apr 2008 12:38:59 -0600 [thread overview]
Message-ID: <20080425183935.158406930@ldl.fc.hp.com> (raw)
In-Reply-To: 20080425183807.366134771@ldl.fc.hp.com
[-- Attachment #1: pnp-make-interfaces-private --]
[-- Type: text/plain, Size: 6939 bytes --]
The interfaces for registering protocols, devices, cards,
and resource options should only be used inside the PNP core.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
---
drivers/pnp/base.h | 24 +++++++++++++++++++++++-
include/linux/pnp.h | 34 ----------------------------------
2 files changed, 23 insertions(+), 35 deletions(-)
Index: work10/include/linux/pnp.h
===================================================================
--- work10.orig/include/linux/pnp.h 2008-04-25 11:15:08.000000000 -0600
+++ work10/include/linux/pnp.h 2008-04-25 11:15:16.000000000 -0600
@@ -417,19 +417,12 @@
#if defined(CONFIG_PNP)
/* device management */
-int pnp_register_protocol(struct pnp_protocol *protocol);
-void pnp_unregister_protocol(struct pnp_protocol *protocol);
-int pnp_add_device(struct pnp_dev *dev);
int pnp_device_attach(struct pnp_dev *pnp_dev);
void pnp_device_detach(struct pnp_dev *pnp_dev);
extern struct list_head pnp_global;
extern int pnp_platform_devices;
/* multidevice card support */
-int pnp_add_card(struct pnp_card *card);
-void pnp_remove_card(struct pnp_card *card);
-int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
-void pnp_remove_card_device(struct pnp_dev *dev);
struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
const char *id, struct pnp_dev *from);
void pnp_release_card_device(struct pnp_dev *dev);
@@ -438,20 +431,7 @@
extern struct list_head pnp_cards;
/* resource management */
-struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev);
-struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
- int priority);
-int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option,
- struct pnp_irq *data);
-int pnp_register_dma_resource(struct pnp_dev *dev, struct pnp_option *option,
- struct pnp_dma *data);
-int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option,
- struct pnp_port *data);
-int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option,
- struct pnp_mem *data);
-void pnp_init_resources(struct pnp_dev *dev);
int pnp_auto_config_dev(struct pnp_dev *dev);
-int pnp_validate_config(struct pnp_dev *dev);
int pnp_start_dev(struct pnp_dev *dev);
int pnp_stop_dev(struct pnp_dev *dev);
int pnp_activate_dev(struct pnp_dev *dev);
@@ -466,35 +446,19 @@
#else
/* device management */
-static inline int pnp_register_protocol(struct pnp_protocol *protocol) { return -ENODEV; }
-static inline void pnp_unregister_protocol(struct pnp_protocol *protocol) { }
-static inline int pnp_init_device(struct pnp_dev *dev) { return -ENODEV; }
-static inline int pnp_add_device(struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_device_attach(struct pnp_dev *pnp_dev) { return -ENODEV; }
static inline void pnp_device_detach(struct pnp_dev *pnp_dev) { }
#define pnp_platform_devices 0
/* multidevice card support */
-static inline int pnp_add_card(struct pnp_card *card) { return -ENODEV; }
-static inline void pnp_remove_card(struct pnp_card *card) { }
-static inline int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev) { return -ENODEV; }
-static inline void pnp_remove_card_device(struct pnp_dev *dev) { }
static inline struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, const char *id, struct pnp_dev *from) { return NULL; }
static inline void pnp_release_card_device(struct pnp_dev *dev) { }
static inline int pnp_register_card_driver(struct pnp_card_driver *drv) { return -ENODEV; }
static inline void pnp_unregister_card_driver(struct pnp_card_driver *drv) { }
/* resource management */
-static inline struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev) { return NULL; }
-static inline struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev, int priority) { return NULL; }
-static inline int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option, struct pnp_irq *data) { return -ENODEV; }
-static inline int pnp_register_dma_resource(struct pnp_dev *dev, struct pnp_option *option, struct pnp_dma *data) { return -ENODEV; }
-static inline int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option, struct pnp_port *data) { return -ENODEV; }
-static inline int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option, struct pnp_mem *data) { return -ENODEV; }
-static inline void pnp_init_resources(struct pnp_dev *dev) { }
static inline int pnp_auto_config_dev(struct pnp_dev *dev) { return -ENODEV; }
-static inline int pnp_validate_config(struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_start_dev(struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_stop_dev(struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_activate_dev(struct pnp_dev *dev) { return -ENODEV; }
Index: work10/drivers/pnp/base.h
===================================================================
--- work10.orig/drivers/pnp/base.h 2008-04-25 11:15:14.000000000 -0600
+++ work10/drivers/pnp/base.h 2008-04-25 11:15:16.000000000 -0600
@@ -1,12 +1,37 @@
extern spinlock_t pnp_lock;
void *pnp_alloc(long size);
+
+int pnp_register_protocol(struct pnp_protocol *protocol);
+void pnp_unregister_protocol(struct pnp_protocol *protocol);
+
#define PNP_EISA_ID_MASK 0x7fffffff
void pnp_eisa_id_to_string(u32 id, char *str);
struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);
struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);
+
+int pnp_add_device(struct pnp_dev *dev);
struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
-struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id);
int pnp_interface_attach_device(struct pnp_dev *dev);
+
+int pnp_add_card(struct pnp_card *card);
+struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id);
+void pnp_remove_card(struct pnp_card *card);
+int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
+void pnp_remove_card_device(struct pnp_dev *dev);
+
+struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev);
+struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
+ int priority);
+int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option,
+ struct pnp_irq *data);
+int pnp_register_dma_resource(struct pnp_dev *dev, struct pnp_option *option,
+ struct pnp_dma *data);
+int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option,
+ struct pnp_port *data);
+int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option,
+ struct pnp_mem *data);
+void pnp_init_resources(struct pnp_dev *dev);
+
void pnp_fixup_device(struct pnp_dev *dev);
void pnp_free_option(struct pnp_option *option);
int __pnp_add_device(struct pnp_dev *dev);
--
next prev parent reply other threads:[~2008-04-25 19:03 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-25 18:38 [patch 00/54] PNP cleanup, v4 Bjorn Helgaas
2008-04-25 18:38 ` [patch 01/54] PNP: turn on -DDEBUG when CONFIG_PNP_DEBUG is set Bjorn Helgaas
2008-04-25 18:38 ` [patch 02/54] ISAPNP: move config register addresses out of isapnp.h Bjorn Helgaas
2008-04-25 18:38 ` [patch 03/54] PNPACPI: continue after _CRS and _PRS errors Bjorn Helgaas
2008-04-25 18:38 ` [patch 04/54] PNP: make pnp_add_id() internal to PNP core Bjorn Helgaas
2008-04-25 18:38 ` [patch 05/54] PNP: change pnp_add_id() to allocate its own pnp_id structures Bjorn Helgaas
2008-04-25 18:38 ` [patch 06/54] PNP: add pnp_eisa_id_to_string() Bjorn Helgaas
2008-04-25 18:38 ` [patch 07/54] PNP: add pnp_alloc_dev() Bjorn Helgaas
2008-04-25 18:38 ` [patch 08/54] PNP: make pnp_add_card_id() internal to PNP core Bjorn Helgaas
2008-04-25 18:38 ` [patch 09/54] PNP: change pnp_add_card_id() to allocate its own pnp_id structures Bjorn Helgaas
2008-04-25 18:38 ` [patch 10/54] ISAPNP: pull pnp_add_card_id() out of isapnp_parse_card_id() Bjorn Helgaas
2008-04-25 18:38 ` [patch 11/54] PNP: add pnp_alloc_card() Bjorn Helgaas
2008-04-25 18:38 ` [patch 12/54] PNPACPI: pnpacpi_encode_ext_irq() wrongly set "irq" instead of "extended_irq" Bjorn Helgaas
2008-04-25 18:38 ` [patch 13/54] PNPACPI: use temporaries to reduce repetition Bjorn Helgaas
2008-04-25 18:38 ` [patch 14/54] PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() Bjorn Helgaas
2008-04-25 18:38 ` [patch 15/54] PNPACPI: extend irq_flags() to set IORESOURCE_IRQ_SHAREABLE when appropriate Bjorn Helgaas
2008-04-25 18:38 ` [patch 16/54] PNPACPI: pass pnp_dev instead of acpi_handle Bjorn Helgaas
2008-04-25 18:38 ` [patch 17/54] PNP: add debug output to option registration Bjorn Helgaas
2008-04-25 18:38 ` [patch 18/54] PNP: remove pnp_resource_table from internal get/set interfaces Bjorn Helgaas
2008-04-25 18:38 ` [patch 19/54] PNP: remove more pnp_resource_table arguments Bjorn Helgaas
2008-04-25 18:38 ` [patch 20/54] PNP: add debug output to encoders Bjorn Helgaas
2008-04-25 18:38 ` [patch 21/54] PNP: add debug when assigning PNP resources Bjorn Helgaas
2008-04-26 21:26 ` Rene Herman
2008-04-28 15:25 ` Bjorn Helgaas
2008-04-25 18:38 ` [patch 22/54] PNP: add pnp_init_resources(struct pnp_dev *) interface Bjorn Helgaas
2008-04-25 18:38 ` [patch 23/54] PNP: remove pnp_resource_table from internal pnp_clean_resource_table interface Bjorn Helgaas
2008-04-25 18:38 ` [patch 24/54] PNP: remove unused interfaces using pnp_resource_table Bjorn Helgaas
2008-04-25 18:38 ` [patch 25/54] PNP: use dev_printk when possible Bjorn Helgaas
2008-04-25 18:38 ` [patch 26/54] PNP: factor pnp_init_resource_table() and pnp_clean_resource_table() Bjorn Helgaas
2008-04-26 21:33 ` Rene Herman
2008-04-28 17:15 ` Bjorn Helgaas
2008-04-25 18:38 ` [patch 27/54] PNP: add pnp_get_resource() interface Bjorn Helgaas
2008-04-25 18:38 ` [patch 28/54] PNP: remove pnp_mem_flags() as an lvalue Bjorn Helgaas
2008-04-25 18:38 ` [patch 29/54] PNP: convert resource accessors to use pnp_get_resource(), not pnp_resource_table Bjorn Helgaas
2008-04-26 21:42 ` Rene Herman
2008-04-28 17:19 ` Bjorn Helgaas
2008-04-25 18:38 ` [patch 30/54] PNP: use conventional "i" for loop indices Bjorn Helgaas
2008-04-25 18:38 ` [patch 31/54] PNP: reduce redundancy in pnp_assign_port() and others Bjorn Helgaas
2008-04-25 18:38 ` [patch 32/54] PNP: reduce redundancy in pnp_check_port() " Bjorn Helgaas
2008-04-25 18:38 ` [patch 33/54] PNP: reduce redundancy in pnp_set_current_resources() Bjorn Helgaas
2008-04-25 18:38 ` [patch 34/54] PNP: check for conflicts with all resources, not just earlier ones Bjorn Helgaas
2008-04-25 18:38 ` [patch 35/54] PNP: pass resources, not indexes, to pnp_check_port(), et al Bjorn Helgaas
2008-04-25 18:38 ` [patch 36/54] PNP: convert resource checks to use pnp_get_resource(), not pnp_resource_table Bjorn Helgaas
2008-04-25 18:38 ` [patch 37/54] PNP: convert encoders " Bjorn Helgaas
2008-04-25 18:38 ` [patch 38/54] PNP: remove PNP_MAX_* uses Bjorn Helgaas
2008-04-26 22:10 ` Rene Herman
2008-04-25 18:38 ` [patch 39/54] rtc: dont reference pnp_resource_table directly Bjorn Helgaas
2008-04-25 18:38 ` [patch 40/54] PNP: make pnp_resource_table private to PNP core Bjorn Helgaas
2008-04-25 18:38 ` [patch 41/54] PNP: remove pnp_resource_table references from resource decoders Bjorn Helgaas
2008-04-26 22:28 ` Rene Herman
2008-04-28 20:36 ` Bjorn Helgaas
2008-04-28 20:41 ` Rene Herman
2008-04-25 18:38 ` [patch 42/54] PNP: add struct pnp_resource Bjorn Helgaas
2008-04-25 18:38 ` [patch 43/54] PNP: add pnp_resource index for ISAPNP Bjorn Helgaas
2008-04-25 18:38 ` [patch 44/54] PNP: add pnp_new_resource() to find a new unset pnp_resource Bjorn Helgaas
2008-04-26 22:37 ` Rene Herman
2008-04-28 20:43 ` Bjorn Helgaas
2008-04-25 18:38 ` [patch 45/54] PNP: make generic pnp_add_irq_resource() Bjorn Helgaas
2008-04-25 18:38 ` [patch 46/54] PNP: make generic pnp_add_dma_resource() Bjorn Helgaas
2008-04-25 18:38 ` [patch 47/54] PNP: make generic pnp_add_io_resource() Bjorn Helgaas
2008-04-25 18:38 ` [patch 48/54] PNP: make generic pnp_add_mem_resource() Bjorn Helgaas
2008-04-25 18:38 ` [patch 49/54] PNP: use pnp_get_pnp_resource() in resource assignment functions Bjorn Helgaas
2008-04-25 18:38 ` [patch 50/54] ISAPNP: fold isapnp_read_resources() back into isapnp_get_resources() Bjorn Helgaas
2008-04-26 23:07 ` Rene Herman
2008-04-28 21:07 ` Bjorn Helgaas
2008-04-29 6:53 ` 2.6.25 pci=noacpi Richard
2008-04-29 7:04 ` Andrew Morton
2008-04-29 7:17 ` Richard
2008-04-29 7:27 ` Richard
2008-05-04 19:23 ` Rene Herman
2008-05-08 6:59 ` Richard
2008-05-08 7:08 ` Richard
2008-05-08 11:50 ` Rene Herman
2008-04-25 18:38 ` [patch 51/54] PNPACPI: move _CRS/_PRS warnings closer to the action Bjorn Helgaas
2008-04-25 18:38 ` Bjorn Helgaas [this message]
2008-04-25 18:39 ` [patch 53/54] ISAPNP: remove unused pnp_dev->regs field Bjorn Helgaas
2008-04-25 18:39 ` [patch 54/54] PNPBIOS: remove include/linux/pnpbios.h Bjorn Helgaas
2008-04-26 23:34 ` [patch 00/54] PNP cleanup, v4 Rene Herman
2008-04-26 23:47 ` Rene Herman
2008-04-28 21:16 ` 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=20080425183935.158406930@ldl.fc.hp.com \
--to=bjorn.helgaas@hp.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=rene.herman@gmail.com \
/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