aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-28 18:33:55 -0400
committerLen Brown <len.brown@intel.com>2008-04-29 03:22:17 -0400
commit048825deea5f261335b5202cd1114c53a3a21ae7 (patch)
tree2398c49b04f00569f86e7c50c4de081f10d3b2e8
parentbda1e4e5a3d976046378cd495a63e1ee0847deec (diff)
PNP: make pnp_add_card_id() internal to PNP core
pnp_add_card_id() doesn't need to be exposed outside the PNP core, so move the declaration to an internal header file. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/pnp/base.h1
-rw-r--r--include/linux/pnp.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index ff435bd1ca18..b492569bcdf4 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -4,6 +4,7 @@ void *pnp_alloc(long size);
4void pnp_eisa_id_to_string(u32 id, char *str); 4void pnp_eisa_id_to_string(u32 id, char *str);
5struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid); 5struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);
6struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id); 6struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
7int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card);
7int pnp_interface_attach_device(struct pnp_dev *dev); 8int pnp_interface_attach_device(struct pnp_dev *dev);
8void pnp_fixup_device(struct pnp_dev *dev); 9void pnp_fixup_device(struct pnp_dev *dev);
9void pnp_free_option(struct pnp_option *option); 10void pnp_free_option(struct pnp_option *option);
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 9a05ab5515b6..7639db83ce3f 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -371,7 +371,6 @@ int pnp_add_card(struct pnp_card *card);
371void pnp_remove_card(struct pnp_card *card); 371void pnp_remove_card(struct pnp_card *card);
372int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev); 372int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
373void pnp_remove_card_device(struct pnp_dev *dev); 373void pnp_remove_card_device(struct pnp_dev *dev);
374int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card);
375struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, 374struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
376 const char *id, struct pnp_dev *from); 375 const char *id, struct pnp_dev *from);
377void pnp_release_card_device(struct pnp_dev *dev); 376void pnp_release_card_device(struct pnp_dev *dev);
@@ -423,7 +422,6 @@ static inline int pnp_add_card(struct pnp_card *card) { return -ENODEV; }
423static inline void pnp_remove_card(struct pnp_card *card) { } 422static inline void pnp_remove_card(struct pnp_card *card) { }
424static inline int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev) { return -ENODEV; } 423static inline int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev) { return -ENODEV; }
425static inline void pnp_remove_card_device(struct pnp_dev *dev) { } 424static inline void pnp_remove_card_device(struct pnp_dev *dev) { }
426static inline int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card) { return -ENODEV; }
427static inline struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, const char *id, struct pnp_dev *from) { return NULL; } 425static inline struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, const char *id, struct pnp_dev *from) { return NULL; }
428static inline void pnp_release_card_device(struct pnp_dev *dev) { } 426static inline void pnp_release_card_device(struct pnp_dev *dev) { }
429static inline int pnp_register_card_driver(struct pnp_card_driver *drv) { return -ENODEV; } 427static inline int pnp_register_card_driver(struct pnp_card_driver *drv) { return -ENODEV; }