2008-06-04 22:16:14

by Bjorn Helgaas

Subject: [patch 16/18] PNP: remove extra 0x100 bit from option priority

When building resource options, ISAPNP and PNPBIOS set the priority
to something like "0x100 | PNP_RES_PRIORITY_ACCEPTABLE", but we
immediately mask off the 0x100 again in pnp_build_option(), so that
bit looks superfluous.

Thanks to Rene Herman <[email protected]> for pointing this out.

Signed-off-by: Bjorn Helgaas <[email protected]>

Index: work10/drivers/pnp/isapnp/core.c
===================================================================
--- work10.orig/drivers/pnp/isapnp/core.c 2008-06-02 15:00:07.000000000 -0600
+++ work10/drivers/pnp/isapnp/core.c 2008-06-02 15:00:10.000000000 -0600
@@ -582,7 +582,7 @@ isapnp_parse_name(char *name, unsigned i
static int __init isapnp_create_device(struct pnp_card *card,
unsigned short size)
{
- int number = 0, skip = 0, priority = 0, compat = 0;
+ int number = 0, skip = 0, priority, compat = 0;
unsigned char type, tmp[17];
struct pnp_option *option;
struct pnp_dev *dev;
@@ -621,7 +621,6 @@ static int __init isapnp_create_device(s
} else {
skip = 1;
}
- priority = 0;
compat = 0;
break;
case _STAG_COMPATDEVID:
@@ -650,10 +649,10 @@ static int __init isapnp_create_device(s
case _STAG_STARTDEP:
if (size > 1)
goto __skip;
- priority = 0x100 | PNP_RES_PRIORITY_ACCEPTABLE;
+ priority = PNP_RES_PRIORITY_ACCEPTABLE;
if (size > 0) {
isapnp_peek(tmp, size);
- priority = 0x100 | tmp[0];
+ priority = tmp[0];
size = 0;
}
option = pnp_register_dependent_option(dev, priority);
@@ -663,7 +662,6 @@ static int __init isapnp_create_device(s
case _STAG_ENDDEP:
if (size != 0)
goto __skip;
- priority = 0;
dev_dbg(&dev->dev, "end dependent options\n");
break;
case _STAG_IOPORT:
Index: work10/drivers/pnp/pnpbios/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpbios/rsparser.c 2008-06-02 15:00:07.000000000 -0600
+++ work10/drivers/pnp/pnpbios/rsparser.c 2008-06-02 15:00:10.000000000 -0600
@@ -315,7 +315,7 @@ pnpbios_parse_resource_option_data(unsig
struct pnp_dev *dev)
{
unsigned int len, tag;
- int priority = 0;
+ int priority;
struct pnp_option *option, *option_independent;

if (!p)
@@ -389,9 +389,9 @@ pnpbios_parse_resource_option_data(unsig
case SMALL_TAG_STARTDEP:
if (len > 1)
goto len_err;
- priority = 0x100 | PNP_RES_PRIORITY_ACCEPTABLE;
+ priority = PNP_RES_PRIORITY_ACCEPTABLE;
if (len > 0)
- priority = 0x100 | p[1];
+ priority = p[1];
option = pnp_register_dependent_option(dev, priority);
if (!option)
return NULL;
Index: work10/drivers/pnp/pnpacpi/rsparser.c
===================================================================
--- work10.orig/drivers/pnp/pnpacpi/rsparser.c 2008-06-02 15:00:07.000000000 -0600
+++ work10/drivers/pnp/pnpacpi/rsparser.c 2008-06-02 15:00:10.000000000 -0600
@@ -545,7 +545,7 @@ struct acpipnp_parse_option_s {
static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
void *data)
{
- int priority = 0;
+ int priority;
struct acpipnp_parse_option_s *parse_data = data;
struct pnp_dev *dev = parse_data->dev;
struct pnp_option *option = parse_data->option;

--

2008-06-14 10:40:34

by Rene Herman

Subject: Re: [patch 16/18] PNP: remove extra 0x100 bit from option priority

On 05-06-08 00:09, Bjorn Helgaas wrote:

> When building resource options, ISAPNP and PNPBIOS set the priority
> to something like "0x100 | PNP_RES_PRIORITY_ACCEPTABLE", but we
> immediately mask off the 0x100 again in pnp_build_option(), so that
> bit looks superfluous.
>
> Thanks to Rene Herman <[email protected]> for pointing this out.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>

Acked-by: Rene Herman <[email protected]>

Rene