drivers/pnp/manager.c cleanups
PATCH 1/1 drivers/pnp/manager.c cleanups
This patch contains the following cleanups that are now possible:
- remove the following unused functions:
- pnp_manual_config_dev()
- pnp_resource_change()
- remove the following unused EXPORT_SYMBOL's:
- pnp_start_dev
- pnp_stop_dev
- pnp_init_resource_table
Signed-off-by Adrian Bunk <[email protected]>
---
This patch has been sent on:
- 27 Feb 2008
- 13 Feb 2008
drivers/pnp/manager.c | 72 ------------------------------------------ include/linux/pnp.h | 3 - 2 files changed, 75 deletions(-)
cb84fb3720df015ede1ded3728a721a883ffd6f5 diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index c28caf2..0ebd36d 100644
drivers/pnp/manager.c +0 -72
@@ -377,59 +377,6 @@ fail: }/** -* pnp_manual_config_dev - Disables Auto Config and Manually sets the resource table -* @dev: pointer to the desired device -* @res: pointer to the new resource config -* @mode: 0 or PNP_CONFIG_FORCE -* -* This function can be used by drivers that want to manually set thier resources. -*/ -int pnp_manual_config_dev (struct pnp_dev *dev,struct pnp_resource_table *res, -int mode) -{ -int i; -struct pnp_resource_table *bak; - -if (!pnp_can_configure (dev)) -return -ENODEV ; - bak =pnp_alloc (sizeof (struct pnp_resource_table )); -if (!bak) -return -ENOMEM ; - *bak = dev->res; - -mutex_lock (&pnp_res_mutex); - dev->res = *res; -if (!(mode &PNP_CONFIG_FORCE )) { -for (i =0 ; i <PNP_MAX_PORT ; i++) { -if (!pnp_check_port (dev, i)) - goto fail; - } -for (i =0 ; i <PNP_MAX_MEM ; i++) { -if (!pnp_check_mem (dev, i)) - goto fail; - } -for (i =0 ; i <PNP_MAX_IRQ ; i++) { -if (!pnp_check_irq (dev, i)) - goto fail; - } -for (i =0 ; i <PNP_MAX_DMA ; i++) { -if (!pnp_check_dma (dev, i)) - goto fail; - } - } -mutex_unlock (&pnp_res_mutex); - -kfree (bak); -return 0 ; - -fail: - dev->res = *bak; -mutex_unlock (&pnp_res_mutex); -kfree (bak); -return -EINVAL ; -} - -/** * pnp_auto_config_dev - automatically assigns resources to a device * @dev: pointer to the desired device */
@@ -555,24 +502,5 @@ int pnp_disable_dev(struct pnp_dev *dev)return 0 ; } -/** -* pnp_resource_change - change one resource -* @resource: pointer to resource to be changed -* @start: start of region -* @size: size of region -*/ -void pnp_resource_change (struct resource *resource,resource_size_t start, -resource_size_t size) -{ - resource->flags &= ~(IORESOURCE_AUTO |IORESOURCE_UNSET ); - resource->start = start; - resource->end = start + size -1 ; -} - -EXPORT_SYMBOL (pnp_manual_config_dev); -EXPORT_SYMBOL (pnp_start_dev); -EXPORT_SYMBOL (pnp_stop_dev);EXPORT_SYMBOL (pnp_activate_dev);EXPORT_SYMBOL (pnp_disable_dev); -EXPORT_SYMBOL (pnp_resource_change); -EXPORT_SYMBOL (pnp_init_resource_table);
include/linux/pnp.h +0 -3
@@ -389,8 +389,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_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);int pnp_start_dev (struct pnp_dev *dev);
@@ -438,7 +436,6 @@ static inline int pnp_register_dma_resource(struct pnp_option *option, struct pnstatic 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_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 ; }static inline int pnp_start_dev (struct pnp_dev *dev) {return -ENODEV ; }