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

Commit 62cfb298 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

PNP: make interfaces private to the PNP core 



The interfaces for registering protocols, devices, cards,
and resource options should only be used inside the PNP core.

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 d152cf5d

drivers/pnp/base.h

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

include/linux/pnp.h

+0 −36
Original line number Diff line number Diff line
@@ -414,19 +414,12 @@ extern struct bus_type pnp_bus_type; 
#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);
@@ -435,20 +428,7 @@ void pnp_unregister_card_driver(struct pnp_card_driver *drv); 
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);
@@ -463,35 +443,19 @@ void pnp_unregister_driver(struct pnp_driver *drv); 
#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; }