some PNP cleanups
PATCH 1/1 some PNP cleanups
This patch makes the following changes to the PNP code:
- make some needlessly global code static
- remove the EXPORT_SYMBOL(pnp_assign_resources) since this function is only used in the file it is defined in
Signed-off-by Adrian Bunk <[email protected]>
---
diffstat output:
drivers/pnp/core.c | 2 +- drivers/pnp/interface.c | 2 +- drivers/pnp/manager.c | 3 +-- drivers/pnp/pnpbios/core.c | 4 ++-- drivers/pnp/resource.c | 11 +++++------ include/linux/pnp.h | 2 -- 6 files changed, 10 insertions(+), 14 deletions(-)
This patch was already sent on:
- 21 Nov 2004
include/linux/pnp.h renamed from include/linux/pnp.h.old +0 -2
@@ -378,7 +369,6 @@int pnp_register_port_resource (struct pnp_option *option,struct pnp_port *data);int pnp_register_mem_resource (struct pnp_option *option,struct pnp_mem *data);void pnp_init_resource_table (struct pnp_resource_table *table); -int pnp_assign_resources (struct pnp_dev *dev,int depnum);int pnp_manual_config_dev (struct pnp_dev *dev,struct pnp_resource_table *res,int mode);int pnp_auto_config_dev (struct pnp_dev *dev);int pnp_validate_config (struct pnp_dev *dev);
@@ -423,7 +411,6 @@static inline int pnp_register_port_resource (struct pnp_option *option,struct pnp_port *data) {return -ENODEV ; }static inline int pnp_register_mem_resource (struct pnp_option *option,struct pnp_mem *data) {return -ENODEV ; }static inline void pnp_init_resource_table (struct pnp_resource_table *table) { } -static inline int pnp_assign_resources (struct pnp_dev *dev,int depnum) {return -ENODEV ; }static inline int pnp_manual_config_dev (struct pnp_dev *dev,struct pnp_resource_table *res,int mode) {return -ENODEV ; }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 ; }
drivers/pnp/core.c renamed from drivers/pnp/core.c.old +1 -1
@@ -18,7 +18,7 @@#include "base.h" -LIST_HEAD (pnp_protocols); +static LIST_HEAD (pnp_protocols);LIST_HEAD (pnp_global);spinlock_t pnp_lock =SPIN_LOCK_UNLOCKED ;
drivers/pnp/interface.c renamed from drivers/pnp/interface.c.old +1 -1
@@ -29,7 +29,7 @@typedef struct pnp_info_buffer pnp_info_buffer_t ; -int pnp_printf (pnp_info_buffer_t * buffer,char *fmt,...) +static int pnp_printf (pnp_info_buffer_t * buffer,char *fmt,...) {va_list args;int res;
drivers/pnp/manager.c renamed from drivers/pnp/manager.c.old +1 -2
@@ -296,7 +296,7 @@* * Only set depnum to 0 if the device does not have dependent options. */ -int pnp_assign_resources (struct pnp_dev *dev,int depnum) +static int pnp_assign_resources (struct pnp_dev *dev,int depnum) {struct pnp_port *port;struct pnp_mem *mem;
@@ -558,7 +558,6 @@ } -EXPORT_SYMBOL (pnp_assign_resources);EXPORT_SYMBOL (pnp_manual_config_dev);EXPORT_SYMBOL (pnp_auto_config_dev);EXPORT_SYMBOL (pnp_activate_dev);
drivers/pnp/pnpbios/core.c renamed from drivers/pnp/pnpbios/core.c.old +2 -2
@@ -453,7 +453,7 @@/* PnP BIOS signature: "$PnP" */ #define PNP_SIGNATURE (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24)) -int __init pnpbios_probe_system (void ) +static int __init pnpbios_probe_system (void ) {union pnp_bios_install_struct *check;u8 sum;
@@ -529,7 +529,7 @@ { } }; -int __init pnpbios_init (void ) +static int __init pnpbios_init (void ) {int ret;
drivers/pnp/resource.c renamed from drivers/pnp/resource.c.old +5 -5
@@ -21,11 +21,11 @@#include <linux/pnp.h> #include "base.h" -int pnp_skip_pci_scan;/* skip PCI resource scanning */ -int pnp_reserve_irq[16 ] = { [0 ...15 ] =-1 };/* reserve (don't use) some IRQ */ -int pnp_reserve_dma[8 ] = { [0 ...7 ] =-1 };/* reserve (don't use) some DMA */ -int pnp_reserve_io[16 ] = { [0 ...15 ] =-1 };/* reserve (don't use) some I/O region */ -int pnp_reserve_mem[16 ] = { [0 ...15 ] =-1 };/* reserve (don't use) some memory region */ +static int pnp_skip_pci_scan;/* skip PCI resource scanning */ +static int pnp_reserve_irq[16 ] = { [0 ...15 ] =-1 };/* reserve (don't use) some IRQ */ +static int pnp_reserve_dma[8 ] = { [0 ...7 ] =-1 };/* reserve (don't use) some DMA */ +static int pnp_reserve_io[16 ] = { [0 ...15 ] =-1 };/* reserve (don't use) some I/O region */ +static int pnp_reserve_mem[16 ] = { [0 ...15 ] =-1 };/* reserve (don't use) some memory region */ /*