Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Bjorn Helgaas 17 years ago
parent
bda1e4e5a3
commit
048825deea
2 changed files with 1 additions and 2 deletions
Split View Show Diff Stats
  1. 1 0
      drivers/pnp/base.h
  2. 0 2
      include/linux/pnp.h

+ 1 - 0
drivers/pnp/base.h
View File 

@@ -4,6 +4,7 @@ void *pnp_alloc(long size);
 
 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_id *pnp_add_id(struct pnp_dev *dev, char *id);
 
+int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card);
 
 int pnp_interface_attach_device(struct pnp_dev *dev);
 
 void pnp_fixup_device(struct pnp_dev *dev);
 
 void pnp_free_option(struct pnp_option *option);

+ 0 - 2
include/linux/pnp.h
View File 

@@ -371,7 +371,6 @@ 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);
 
-int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card);
 
 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);
 
@@ -423,7 +422,6 @@ 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 int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card) { return -ENODEV; }
 
 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; }