drivers/pnp/: cleanups
Subsystems (3)
PATCH 1/1 drivers/pnp/: 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
- #if 0 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
Note that this patch #if 0's exactly one functions and removes no functions. Most it does is the #if 0 of EXPORT_SYMBOL's, so if any modular code will use any of them, re-adding will be trivial.
Modular ISAPnP might be interesting in some cases, but this is more legacy code. If someone would work on it to sort all the issues out (starting with the point that most users of __ISAPNP__ will have to be fixed) re-enabling the required EXPORT_SYMBOL's won't be hard for him.
---
This patch was already sent on:
- 21 Jun 2005
drivers/pnp/card.c | 4 +++- drivers/pnp/core.c | 5 ++++- drivers/pnp/driver.c | 2 ++ drivers/pnp/isapnp/core.c | 2 ++ drivers/pnp/manager.c | 2 ++ drivers/pnp/pnpacpi/core.c | 6 ++++-- drivers/pnp/resource.c | 2 ++ include/linux/pnp.h | 2 -- 8 files changed, 19 insertions(+), 6 deletions(-)
drivers/pnp/card.c renamed from drivers/pnp/card.c.old +3 -1
@@ -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,13 @@pnp_unregister_driver (&drv->link); } +#if 0 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); +#endif /* 0 */ 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 +4 -1
@@ -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,9 @@subsys_initcall (pnp_init); +#if 0 EXPORT_SYMBOL (pnp_register_protocol);EXPORT_SYMBOL (pnp_unregister_protocol);EXPORT_SYMBOL (pnp_add_device);EXPORT_SYMBOL (pnp_remove_device); +#endif /* 0 */
drivers/pnp/pnpacpi/core.c renamed from drivers/pnp/pnpacpi/core.c.old +4 -2
@@ -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,6 @@ }__setup ("pnpacpi=" , pnpacpi_setup); +#if 0 EXPORT_SYMBOL (pnpacpi_protocol); +#endif
drivers/pnp/driver.c renamed from drivers/pnp/driver.c.old +2 -0
@@ -217,6 +217,8 @@EXPORT_SYMBOL (pnp_register_driver);EXPORT_SYMBOL (pnp_unregister_driver); +#if 0 EXPORT_SYMBOL (pnp_add_id); +#endif EXPORT_SYMBOL (pnp_device_attach);EXPORT_SYMBOL (pnp_device_detach);
drivers/pnp/isapnp/core.c renamed from drivers/pnp/isapnp/core.c.old +2 -0
@@ -952,7 +952,9 @@EXPORT_SYMBOL (isapnp_present);EXPORT_SYMBOL (isapnp_cfg_begin);EXPORT_SYMBOL (isapnp_cfg_end); +#if 0 EXPORT_SYMBOL (isapnp_read_byte); +#endif 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 +2 -0
@@ -563,7 +563,9 @@EXPORT_SYMBOL (pnp_manual_config_dev); +#if 0 EXPORT_SYMBOL (pnp_auto_config_dev); +#endif 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 +2 -0
@@ -478,14 +478,16 @@ } +#if 0 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); +#endif /* 0 */ /* format is: pnp_reserve_irq=irq1[,irq2] .... */ static int __init pnp_setup_reserve_irq (char *str)