dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Pull pnp into release branch

This commit is contained in:
Len Brown 2007-08-24 22:20:22 -04:00
parent 4548a9dbe0 b173491339
commit a6729753a7
13 changed files with 42 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pnp/card.c
View File

@ -25,13 +25,13 @@ static const struct pnp_card_device_id *match_card(struct pnp_card_driver *drv,
int found;
struct pnp_dev *dev;
if (i == PNP_MAX_DEVICES
|| !*drv_id->devs[i].id)
if (i == PNP_MAX_DEVICES ||
!*drv_id->devs[i].id)
return drv_id;
found = 0;
card_for_each_dev(card, dev) {
if (compare_pnp_id
(dev->id, drv_id->devs[i].id)) {
if (compare_pnp_id(dev->id,
drv_id->devs[i].id)) {
found = 1;
break;
}
@ -183,7 +183,7 @@ static int pnp_interface_attach_card(struct pnp_card *card)
return 0;
err_name:
err_name:
device_remove_file(&card->dev, &dev_attr_name);
return rc;
}
@ -321,10 +321,10 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
pos = pos->next;
}
done:
done:
return NULL;
found:
found:
dev->card_link = clink;
dev->dev.driver = &drv->link.driver;
if (pnp_bus_type.probe(&dev->dev))
@ -334,7 +334,7 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
return dev;
err_out:
err_out:
dev->dev.driver = NULL;
dev->card_link = NULL;
return NULL;

7
drivers/pnp/core.c
View File

@ -52,9 +52,6 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
int nodenum;
struct list_head *pos;
if (!protocol)
return -EINVAL;
INIT_LIST_HEAD(&protocol->devices);
INIT_LIST_HEAD(&protocol->cards);
nodenum = 0;
@ -94,8 +91,6 @@ static void pnp_free_ids(struct pnp_dev *dev)
struct pnp_id *id;
struct pnp_id *next;
if (!dev)
return;
id = dev->id;
while (id) {
next = id->next;
@ -143,7 +138,7 @@ int __pnp_add_device(struct pnp_dev *dev)
*/
int pnp_add_device(struct pnp_dev *dev)
{
if (!dev || !dev->protocol || dev->card)
if (dev->card)
return -EINVAL;
dev->dev.parent = &dev->protocol->dev;
sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,

6
drivers/pnp/driver.c
View File

@ -118,7 +118,7 @@ static int pnp_device_probe(struct device *dev)
goto fail;
return error;
fail:
fail:
pnp_device_detach(pnp_dev);
return error;
}
@ -232,10 +232,6 @@ int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)
{
struct pnp_id *ptr;
if (!id)
return -EINVAL;
if (!dev)
return -EINVAL;
id->next = NULL;
ptr = dev->id;
while (ptr && ptr->next)

9
drivers/pnp/interface.c
View File

@ -459,7 +459,8 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
up(&pnp_res_mutex);
goto done;
}
done:
done:
if (retval < 0)
return retval;
return count;
@ -499,10 +500,10 @@ int pnp_interface_attach_device(struct pnp_dev *dev)
return 0;
err_res:
err_res:
device_remove_file(&dev->dev, &dev_attr_resources);
err_opt:
err_opt:
device_remove_file(&dev->dev, &dev_attr_options);
err:
err:
return rc;
}

24
drivers/pnp/isapnp/core.c
View File

@ -47,9 +47,6 @@
#if 0
#define ISAPNP_REGION_OK
#endif
#if 0
#define ISAPNP_DEBUG
#endif
int isapnp_disable; /* Disable ISA PnP */
static int isapnp_rdp; /* Read Data Port */
@ -93,7 +90,6 @@ MODULE_LICENSE("GPL");
static unsigned char isapnp_checksum_value;
static DEFINE_MUTEX(isapnp_cfg_mutex);
static int isapnp_detected;
static int isapnp_csn_count;
/* some prototypes */
@ -335,7 +331,7 @@ static int __init isapnp_isolate(void)
} else if (iteration > 1) {
break;
}
__next:
__next:
if (csn == 255)
break;
checksum = 0x6a;
@ -733,7 +729,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
"isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
type, dev->number, card->number);
}
__skip:
__skip:
if (size > 0)
isapnp_skip_bytes(size);
}
@ -788,7 +784,7 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
"isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
type, card->number);
}
__skip:
__skip:
if (size > 0)
isapnp_skip_bytes(size);
}
@ -940,9 +936,6 @@ 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,
@ -993,6 +986,7 @@ static int isapnp_get_resources(struct pnp_dev *dev,
struct pnp_resource_table *res)
{
int ret;
pnp_init_resource_table(res);
isapnp_cfg_begin(dev->card->number, dev->number);
ret = isapnp_read_resources(dev, res);
@ -1046,7 +1040,7 @@ static int isapnp_set_resources(struct pnp_dev *dev,
static int isapnp_disable_resources(struct pnp_dev *dev)
{
if (!dev || !dev->active)
if (!dev->active)
return -EINVAL;
isapnp_cfg_begin(dev->card->number, dev->number);
isapnp_deactivate(dev->number);
@ -1069,7 +1063,6 @@ static int __init isapnp_init(void)
struct pnp_dev *dev;
if (isapnp_disable) {
isapnp_detected = 0;
printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
return 0;
}
@ -1117,7 +1110,6 @@ static int __init isapnp_init(void)
}
isapnp_set_rdp();
}
isapnp_detected = 1;
if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) {
cards = isapnp_isolate();
if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) {
@ -1125,7 +1117,6 @@ static int __init isapnp_init(void)
release_region(_PIDXR, 1);
#endif
release_region(_PNPWRP, 1);
isapnp_detected = 0;
printk(KERN_INFO
"isapnp: No Plug & Play device found\n");
return 0;
@ -1148,13 +1139,12 @@ static int __init isapnp_init(void)
}
}
}
if (cards) {
if (cards)
printk(KERN_INFO
"isapnp: %i Plug & Play card%s detected total\n", cards,
cards > 1 ? "s" : "");
} else {
else
printk(KERN_INFO "isapnp: No Plug & Play card found\n");
}
isapnp_proc_init();
return 0;

45
drivers/pnp/isapnp/proc.c
View File

@ -112,33 +112,6 @@ static int isapnp_proc_attach_device(struct pnp_dev *dev)
return 0;
}
#ifdef MODULE
static int __exit isapnp_proc_detach_device(struct pnp_dev *dev)
{
struct pnp_card *bus = dev->card;
struct proc_dir_entry *de;
char name[16];
if (!(de = bus->procdir))
return -EINVAL;
sprintf(name, "%02x", dev->number);
remove_proc_entry(name, de);
return 0;
}
static int __exit isapnp_proc_detach_bus(struct pnp_card *bus)
{
struct proc_dir_entry *de;
char name[16];
if (!(de = bus->procdir))
return -EINVAL;
sprintf(name, "%02x", bus->number);
remove_proc_entry(name, isapnp_proc_bus_dir);
return 0;
}
#endif /* MODULE */
int __init isapnp_proc_init(void)
{
struct pnp_dev *dev;
@ -149,21 +122,3 @@ int __init isapnp_proc_init(void)
}
return 0;
}
#ifdef MODULE
int __exit isapnp_proc_done(void)
{
struct pnp_dev *dev;
struct pnp_bus *card;
isapnp_for_each_dev(dev) {
isapnp_proc_detach_device(dev);
}
isapnp_for_each_card(card) {
isapnp_proc_detach_bus(card);
}
if (isapnp_proc_bus_dir)
remove_proc_entry("isapnp", proc_bus);
return 0;
}
#endif /* MODULE */

27
drivers/pnp/manager.c
View File

@ -21,9 +21,6 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
resource_size_t *start, *end;
unsigned long *flags;
if (!dev || !rule)
return -EINVAL;
if (idx >= PNP_MAX_PORT) {
pnp_err
("More than 4 ports is incompatible with pnp specifications.");
@ -66,9 +63,6 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
resource_size_t *start, *end;
unsigned long *flags;
if (!dev || !rule)
return -EINVAL;
if (idx >= PNP_MAX_MEM) {
pnp_err
("More than 8 mems is incompatible with pnp specifications.");
@ -127,9 +121,6 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
};
if (!dev || !rule)
return -EINVAL;
if (idx >= PNP_MAX_IRQ) {
pnp_err
("More than 2 irqs is incompatible with pnp specifications.");
@ -181,9 +172,6 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
1, 3, 5, 6, 7, 0, 2, 4
};
if (!dev || !rule)
return -EINVAL;
if (idx >= PNP_MAX_DMA) {
pnp_err
("More than 2 dmas is incompatible with pnp specifications.");
@ -390,7 +378,7 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
up(&pnp_res_mutex);
return 1;
fail:
fail:
pnp_clean_resource_table(&dev->res);
up(&pnp_res_mutex);
return 0;
@ -410,8 +398,6 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
int i;
struct pnp_resource_table *bak;
if (!dev || !res)
return -EINVAL;
if (!pnp_can_configure(dev))
return -ENODEV;
bak = pnp_alloc(sizeof(struct pnp_resource_table));
@ -444,7 +430,7 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
kfree(bak);
return 0;
fail:
fail:
dev->res = *bak;
up(&pnp_res_mutex);
kfree(bak);
@ -460,9 +446,6 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
struct pnp_option *dep;
int i = 1;
if (!dev)
return -EINVAL;
if (!pnp_can_configure(dev)) {
pnp_dbg("Device %s does not support resource configuration.",
dev->dev.bus_id);
@ -541,8 +524,6 @@ int pnp_activate_dev(struct pnp_dev *dev)
{
int error;
if (!dev)
return -EINVAL;
if (dev->active)
return 0; /* the device is already active */
@ -568,8 +549,6 @@ int pnp_disable_dev(struct pnp_dev *dev)
{
int error;
if (!dev)
return -EINVAL;
if (!dev->active)
return 0; /* the device is already disabled */
@ -596,8 +575,6 @@ int pnp_disable_dev(struct pnp_dev *dev)
void pnp_resource_change(struct resource *resource, resource_size_t start,
resource_size_t size)
{
if (resource == NULL)
return;
resource->flags &= ~(IORESOURCE_AUTO | IORESOURCE_UNSET);
resource->start = start;
resource->end = start + size - 1;

4
drivers/pnp/pnpacpi/core.c
View File

@ -248,9 +248,9 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
num++;
return AE_OK;
err1:
err1:
kfree(dev_id);
err:
err:
kfree(dev);
return -EINVAL;
}

23
drivers/pnp/pnpacpi/rsparser.c
View File

@ -34,19 +34,17 @@
*/
static int irq_flags(int triggering, int polarity)
{
int flag;
if (triggering == ACPI_LEVEL_SENSITIVE) {
if (polarity == ACPI_ACTIVE_LOW)
flag = IORESOURCE_IRQ_LOWLEVEL;
return IORESOURCE_IRQ_LOWLEVEL;
else
flag = IORESOURCE_IRQ_HIGHLEVEL;
return IORESOURCE_IRQ_HIGHLEVEL;
} else {
if (polarity == ACPI_ACTIVE_LOW)
flag = IORESOURCE_IRQ_LOWEDGE;
return IORESOURCE_IRQ_LOWEDGE;
else
flag = IORESOURCE_IRQ_HIGHEDGE;
return IORESOURCE_IRQ_HIGHEDGE;
}
return flag;
}
static void decode_irq_flags(int flag, int *triggering, int *polarity)
@ -242,8 +240,7 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res
static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
void *data)
{
struct pnp_resource_table *res_table =
(struct pnp_resource_table *)data;
struct pnp_resource_table *res_table = data;
int i;
switch (res->type) {
@ -566,8 +563,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
void *data)
{
int priority = 0;
struct acpipnp_parse_option_s *parse_data =
(struct acpipnp_parse_option_s *)data;
struct acpipnp_parse_option_s *parse_data = data;
struct pnp_dev *dev = parse_data->dev;
struct pnp_option *option = parse_data->option;
@ -705,7 +701,7 @@ static int pnpacpi_supported_resource(struct acpi_resource *res)
static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
void *data)
{
int *res_cnt = (int *)data;
int *res_cnt = data;
if (pnpacpi_supported_resource(res))
(*res_cnt)++;
@ -714,7 +710,7 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
{
struct acpi_resource **resource = (struct acpi_resource **)data;
struct acpi_resource **resource = data;
if (pnpacpi_supported_resource(res)) {
(*resource)->type = res->type;
@ -886,8 +882,7 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
int i = 0;
/* pnpacpi_build_resource_template allocates extra mem */
int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1;
struct acpi_resource *resource =
(struct acpi_resource *)buffer->pointer;
struct acpi_resource *resource = buffer->pointer;
int port = 0, irq = 0, dma = 0, mem = 0;
pnp_dbg("res cnt %d", res_cnt);

44
drivers/pnp/pnpbios/core.c
View File

@ -419,7 +419,6 @@ static void __init build_devlist(void)
static int pnpbios_disabled;
int pnpbios_dont_use_current_config;
#ifndef MODULE
static int __init pnpbios_setup(char *str)
{
int invert;
@ -443,7 +442,6 @@ static int __init pnpbios_setup(char *str)
}
__setup("pnpbios=", pnpbios_setup);
#endif
/* PnP BIOS signature: "$PnP" */
#define PNP_SIGNATURE (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24))
@ -591,6 +589,7 @@ subsys_initcall(pnpbios_init);
static int __init pnpbios_thread_init(void)
{
struct task_struct *task;
#if defined(CONFIG_PPC_MERGE)
if (check_legacy_ioport(PNPBIOS_BASE))
return 0;
@ -606,48 +605,7 @@ static int __init pnpbios_thread_init(void)
return 0;
}
#ifndef MODULE
/* init/main.c calls pnpbios_init early */
/* Start the kernel thread later: */
module_init(pnpbios_thread_init);
#else
/*
* N.B.: Building pnpbios as a module hasn't been fully implemented
*/
MODULE_LICENSE("GPL");
static int __init pnpbios_init_all(void)
{
int r;
r = pnpbios_init();
if (r)
return r;
r = pnpbios_thread_init();
if (r)
return r;
return 0;
}
static void __exit pnpbios_exit(void)
{
#ifdef CONFIG_HOTPLUG
unloading = 1;
wait_for_completion(&unload_sem);
#endif
pnpbios_proc_exit();
/* We ought to free resources here */
return;
}
module_init(pnpbios_init_all);
module_exit(pnpbios_exit);
#endif
EXPORT_SYMBOL(pnpbios_protocol);

2
drivers/pnp/pnpbios/proc.c
View File

@ -212,7 +212,7 @@ static int proc_write_node(struct file *file, const char __user * buf,
goto out;
}
ret = count;
out:
out:
kfree(node);
return ret;
}

9
drivers/pnp/pnpbios/rsparser.c
View File

@ -238,7 +238,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
break;
default: /* an unkown tag */
len_err:
len_err:
printk(KERN_ERR
"PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
tag, len);
@ -298,6 +298,7 @@ static void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
struct pnp_option *option)
{
struct pnp_mem *mem;
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
@ -468,7 +469,7 @@ static unsigned char *pnpbios_parse_resource_option_data(unsigned char *p,
return p + 2;
default: /* an unkown tag */
len_err:
len_err:
printk(KERN_ERR
"PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
tag, len);
@ -562,7 +563,7 @@ static unsigned char *pnpbios_parse_compatible_ids(unsigned char *p,
break;
default: /* an unkown tag */
len_err:
len_err:
printk(KERN_ERR
"PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
tag, len);
@ -756,7 +757,7 @@ static unsigned char *pnpbios_encode_allocated_resource_data(unsigned char *p,
break;
default: /* an unkown tag */
len_err:
len_err:
printk(KERN_ERR
"PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
tag, len);

26
drivers/pnp/resource.c
View File

@ -47,9 +47,6 @@ struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev)
{
struct pnp_option *option;
if (!dev)
return NULL;
option = pnp_build_option(PNP_RES_PRIORITY_PREFERRED);
/* this should never happen but if it does we'll try to continue */
@ -64,9 +61,6 @@ struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
{
struct pnp_option *option;
if (!dev)
return NULL;
option = pnp_build_option(priority);
if (dev->dependent) {
@ -83,11 +77,6 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
{
struct pnp_irq *ptr;
if (!option)
return -EINVAL;
if (!data)
return -EINVAL;
ptr = option->irq;
while (ptr && ptr->next)
ptr = ptr->next;
@ -112,11 +101,6 @@ int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data)
{
struct pnp_dma *ptr;
if (!option)
return -EINVAL;
if (!data)
return -EINVAL;
ptr = option->dma;
while (ptr && ptr->next)
ptr = ptr->next;
@ -132,11 +116,6 @@ int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data)
{
struct pnp_port *ptr;
if (!option)
return -EINVAL;
if (!data)
return -EINVAL;
ptr = option->port;
while (ptr && ptr->next)
ptr = ptr->next;
@ -152,11 +131,6 @@ int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data)
{
struct pnp_mem *ptr;
if (!option)
return -EINVAL;
if (!data)
return -EINVAL;
ptr = option->mem;
while (ptr && ptr->next)
ptr = ptr->next;