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

Commit b449f63c authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] 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.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5fed0578

drivers/pnp/card.c

+3 −1
Original line number Diff line number Diff line
@@ -12,7 +12,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)
@@ -374,11 +374,13 @@ void pnp_unregister_card_driver(struct pnp_card_driver * drv) 
	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);

drivers/pnp/core.c

+4 −1
Original line number Diff line number Diff line
@@ -158,13 +158,14 @@ void __pnp_remove_device(struct pnp_dev *dev) 
 *

 * 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 @@ static int __init pnp_init(void) 


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/driver.c

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev) 


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

+2 −0
Original line number Diff line number Diff line
@@ -941,7 +941,9 @@ EXPORT_SYMBOL(isapnp_protocol); 
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

+2 −0
Original line number Diff line number Diff line
@@ -555,7 +555,9 @@ void pnp_resource_change(struct resource *resource, unsigned long start, unsigne 




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);