Skip to content

Commit

Permalink
PNP: add pnp_init_resources(struct pnp_dev *) interface
Browse files Browse the repository at this point in the history 
Add pnp_init_resources(struct pnp_dev *) to replace
pnp_init_resource_table(), which takes a pointer to the
pnp_resource_table itself.  Passing only the pnp_dev * reduces
the possibility for error in the caller and removes the
pnp_resource_table implementation detail from the interface.

Even though pnp_init_resource_table() is exported, I did not
export pnp_init_resources() because it is used only by the PNP
core.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Apr 29, 2008
1 parent 81b5c75 commit f449000
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 11 deletions.
6 changes: 3 additions & 3 deletions drivers/pnp/interface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,14 +351,14 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
if (!strnicmp(buf, "auto", 4)) {
if (dev->active)
goto done;
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);
retval = pnp_auto_config_dev(dev);
goto done;
}
if (!strnicmp(buf, "clear", 5)) {
if (dev->active)
goto done;
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);
goto done;
}
if (!strnicmp(buf, "get", 3)) {
Expand All @@ -373,7 +373,7 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
if (dev->active)
goto done;
buf += 3;
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);
mutex_lock(&pnp_res_mutex);
while (1) {
while (isspace(*buf))
Expand Down
4 changes: 2 additions & 2 deletions drivers/pnp/isapnp/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static struct pnp_dev *__init isapnp_parse_device(struct pnp_card *card,
dev->capabilities |= PNP_READ;
dev->capabilities |= PNP_WRITE;
dev->capabilities |= PNP_DISABLE;
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);
return dev;
}

Expand Down Expand Up @@ -981,7 +981,7 @@ static int isapnp_get_resources(struct pnp_dev *dev)
int ret;

dev_dbg(&dev->dev, "get resources\n");
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);
isapnp_cfg_begin(dev->card->number, dev->number);
ret = isapnp_read_resources(dev);
isapnp_cfg_end();
Expand Down
5 changes: 5 additions & 0 deletions drivers/pnp/manager.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,11 @@ void pnp_init_resource_table(struct pnp_resource_table *table)
}
}

void pnp_init_resources(struct pnp_dev *dev)
{
pnp_init_resource_table(&dev->res);
}

/**
* pnp_clean_resources - clears resources that were not manually set
* @res: the resources to clean
Expand Down
2 changes: 1 addition & 1 deletion drivers/pnp/pnpacpi/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)

/* clear out the damaged flags */
if (!dev->active)
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);
pnp_add_device(dev);
num++;

Expand Down
3 changes: 1 addition & 2 deletions drivers/pnp/pnpacpi/rsparser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,7 @@ acpi_status pnpacpi_parse_allocated_resource(struct pnp_dev *dev)

dev_dbg(&dev->dev, "parse allocated resources\n");

/* Blank the resource table values */
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);

return acpi_walk_resources(handle, METHOD_NAME__CRS,
pnpacpi_allocated_resource, dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/pnp/pnpbios/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ static int __init insert_device(struct pnp_bios_node *node)

/* clear out the damaged flags */
if (!dev->active)
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);

pnp_add_device(dev);
pnpbios_interface_attach_device(node);
Expand Down
3 changes: 1 addition & 2 deletions drivers/pnp/pnpbios/rsparser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,

dev_dbg(&dev->dev, "parse allocated resources\n");

/* Blank the resource table values */
pnp_init_resource_table(&dev->res);
pnp_init_resources(dev);

while ((char *)p < (char *)end) {

Expand Down
2 changes: 2 additions & 0 deletions include/linux/pnp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,7 @@ int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option,
int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option,
struct pnp_mem *data);
void pnp_init_resource_table(struct pnp_resource_table *table);
void pnp_init_resources(struct pnp_dev *dev);
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);
Expand Down Expand Up @@ -438,6 +439,7 @@ static inline int pnp_register_dma_resource(struct pnp_dev *dev, struct pnp_opti
static inline int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option, struct pnp_port *data) { return -ENODEV; }
static inline int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option, struct pnp_mem *data) { return -ENODEV; }
static inline void pnp_init_resource_table(struct pnp_resource_table *table) { }
static inline void pnp_init_resources(struct pnp_dev *dev) { }
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; }
Expand Down

0 comments on commit f449000

Please sign in to comment.