Skip to content

Commit

Permalink
PNP: make pnp_add_id() internal to PNP core
Browse files Browse the repository at this point in the history
pnp_add_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>
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Apr 29, 2008
1 parent 4a49049 commit 1692b27
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions drivers/pnp/base.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
extern spinlock_t pnp_lock;
void *pnp_alloc(long size);
int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev);
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);
Expand Down
1 change: 1 addition & 0 deletions drivers/pnp/pnpacpi/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/actypes.h>

#include "../base.h"
#include "pnpacpi.h"

static int num = 0;
Expand Down
1 change: 1 addition & 0 deletions drivers/pnp/pnpbios/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
#include <asm/system.h>
#include <asm/byteorder.h>

#include "../base.h"
#include "pnpbios.h"

/*
Expand Down
2 changes: 0 additions & 2 deletions include/linux/pnp.h
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ void pnp_resource_change(struct resource *resource, resource_size_t start,
/* protocol helpers */
int pnp_is_active(struct pnp_dev *dev);
int compare_pnp_id(struct pnp_id *pos, const char *id);
int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev);
int pnp_register_driver(struct pnp_driver *drv);
void pnp_unregister_driver(struct pnp_driver *drv);

Expand Down Expand Up @@ -450,7 +449,6 @@ static inline void pnp_resource_change(struct resource *resource, resource_size_
/* protocol helpers */
static inline int pnp_is_active(struct pnp_dev *dev) { return 0; }
static inline int compare_pnp_id(struct pnp_id *pos, const char *id) { return -ENODEV; }
static inline int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_register_driver(struct pnp_driver *drv) { return -ENODEV; }
static inline void pnp_unregister_driver(struct pnp_driver *drv) { }

Expand Down

0 comments on commit 1692b27

Please sign in to comment.