Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 048825de authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent bda1e4e5

drivers/pnp/base.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/pnp.h

+0 −2
Original line number Diff line number Diff line
@@ -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; }