drivers/pnp/: possible cleanups
Subsystems (3)
PATCH 1/1 drivers/pnp/: possible cleanups
This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unused global function:
- core.c: pnp_remove_device
- remove the following unneeded EXPORT_SYMBOL's:
- card.c: pnp_add_card
- card.c: pnp_remove_card
- card.c: pnp_add_card_device
- card.c: pnp_remove_card_device
- card.c: pnp_add_card_id
- core.c: pnp_register_protocol
- core.c: pnp_unregister_protocol
- core.c: pnp_add_device
- core.c: pnp_remove_device
- pnpacpi/core.c: pnpacpi_protocol
- driver.c: pnp_add_id
- isapnp/core.c: isapnp_read_byte
- manager.c: pnp_auto_config_dev
- resource.c: pnp_register_dependent_option
- resource.c: pnp_register_independent_option
- resource.c: pnp_register_irq_resource
- resource.c: pnp_register_dma_resource
- resource.c: pnp_register_port_resource
- resource.c: pnp_register_mem_resource
---
drivers/pnp/card.c | 7 +------ drivers/pnp/core.c | 7 ++----- drivers/pnp/driver.c | 1 - drivers/pnp/isapnp/core.c | 1 - drivers/pnp/manager.c | 1 - drivers/pnp/pnpacpi/core.c | 5 ++--- drivers/pnp/resource.c | 8 -------- include/linux/pnp.h | 2 -- 8 files changed, 5 insertions(+), 27 deletions(-)
drivers/pnp/card.c renamed from drivers/pnp/card.c.old +1 -6
@@ -19,7 +19,7 @@#include "base.h" LIST_HEAD (pnp_cards); -LIST_HEAD (pnp_card_drivers); +static LIST_HEAD (pnp_card_drivers);static const struct pnp_card_device_id *match_card (struct pnp_card_driver * drv,struct pnp_card * card)
@@ -380,11 +380,6 @@pnp_unregister_driver (&drv->link); } -EXPORT_SYMBOL (pnp_add_card); -EXPORT_SYMBOL (pnp_remove_card); -EXPORT_SYMBOL (pnp_add_card_device); -EXPORT_SYMBOL (pnp_remove_card_device); -EXPORT_SYMBOL (pnp_add_card_id);EXPORT_SYMBOL (pnp_request_card_device);EXPORT_SYMBOL (pnp_release_card_device);EXPORT_SYMBOL (pnp_register_card_driver);
include/linux/pnp.h renamed from include/linux/pnp.h.old +0 -2
@@ -353,7 +353,6 @@int pnp_register_protocol (struct pnp_protocol *protocol);void pnp_unregister_protocol (struct pnp_protocol *protocol);int pnp_add_device (struct pnp_dev *dev); -void pnp_remove_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;
@@ -399,7 +398,6 @@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 void pnp_remove_device (struct pnp_dev *dev) { }static inline int pnp_device_attach (struct pnp_dev *pnp_dev) {return -ENODEV ; }static inline void pnp_device_detach (struct pnp_dev *pnp_dev) { ; }
drivers/pnp/core.c renamed from drivers/pnp/core.c.old +2 -5
@@ -158,13 +158,14 @@* * this function will free all mem used by dev */ - +#if 0 void pnp_remove_device (struct pnp_dev *dev) {if (!dev || dev->card)return ;__pnp_remove_device (dev); } +#endif /* 0 */ static int __init pnp_init (void ) {
@@ -174,7 +175,3 @@subsys_initcall (pnp_init); -EXPORT_SYMBOL (pnp_register_protocol); -EXPORT_SYMBOL (pnp_unregister_protocol); -EXPORT_SYMBOL (pnp_add_device); -EXPORT_SYMBOL (pnp_remove_device);
drivers/pnp/pnpacpi/core.c renamed from drivers/pnp/pnpacpi/core.c.old +2 -3
@@ -124,7 +124,7 @@return ACPI_FAILURE (status) ? -ENODEV :0 ; } -struct pnp_protocol pnpacpi_protocol = { +static struct pnp_protocol pnpacpi_protocol = { .name ="Plug and Play ACPI" , .get = pnpacpi_get_resources, .set = pnpacpi_set_resources,
@@ -242,7 +242,7 @@ }int pnpacpi_disabled__initdata ; -int __init pnpacpi_init (void ) +static int __init pnpacpi_init (void ) {if (acpi_disabled || pnpacpi_disabled) {pnp_info ("PnP ACPI: disabled" );
@@ -266,4 +266,3 @@ }__setup ("pnpacpi=" , pnpacpi_setup); -EXPORT_SYMBOL (pnpacpi_protocol);
drivers/pnp/driver.c renamed from drivers/pnp/driver.c.old +0 -1
@@ -217,6 +217,5 @@EXPORT_SYMBOL (pnp_register_driver);EXPORT_SYMBOL (pnp_unregister_driver); -EXPORT_SYMBOL (pnp_add_id);EXPORT_SYMBOL (pnp_device_attach);EXPORT_SYMBOL (pnp_device_detach);
drivers/pnp/isapnp/core.c renamed from drivers/pnp/isapnp/core.c.old +0 -1
@@ -952,7 +952,6 @@EXPORT_SYMBOL (isapnp_present);EXPORT_SYMBOL (isapnp_cfg_begin);EXPORT_SYMBOL (isapnp_cfg_end); -EXPORT_SYMBOL (isapnp_read_byte);EXPORT_SYMBOL (isapnp_write_byte);static int isapnp_read_resources (struct pnp_dev *dev,struct pnp_resource_table *res)
drivers/pnp/manager.c renamed from drivers/pnp/manager.c.old +0 -1
@@ -563,7 +563,6 @@EXPORT_SYMBOL (pnp_manual_config_dev); -EXPORT_SYMBOL (pnp_auto_config_dev);EXPORT_SYMBOL (pnp_activate_dev);EXPORT_SYMBOL (pnp_disable_dev);EXPORT_SYMBOL (pnp_resource_change);
drivers/pnp/resource.c renamed from drivers/pnp/resource.c.old +0 -8
@@ -478,14 +478,6 @@ } -EXPORT_SYMBOL (pnp_register_dependent_option); -EXPORT_SYMBOL (pnp_register_independent_option); -EXPORT_SYMBOL (pnp_register_irq_resource); -EXPORT_SYMBOL (pnp_register_dma_resource); -EXPORT_SYMBOL (pnp_register_port_resource); -EXPORT_SYMBOL (pnp_register_mem_resource); - -/* format is: pnp_reserve_irq=irq1[,irq2] .... */ static int __init pnp_setup_reserve_irq (char *str)