The patch titled
pnp: remove extra 0x100 bit from option priority
has been removed from the -mm tree. Its filename was
pnp-remove-extra-0x100-bit-from-option-priority.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: pnp: remove extra 0x100 bit from option priority
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
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 <rene.herman@xxxxxxxxx> for pointing this out.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Cc: Rene Herman <rene.herman@xxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Adam M Belay <abelay@xxxxxxx>
Cc: Li Shaohua <shaohua.li@xxxxxxxxx>
Cc: Matthieu Castet <castet.matthieu@xxxxxxx>
Cc: Thomas Renninger <trenn@xxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pnp/isapnp/core.c | 8 +++-----
drivers/pnp/pnpacpi/rsparser.c | 2 +-
drivers/pnp/pnpbios/rsparser.c | 6 +++---
3 files changed, 7 insertions(+), 9 deletions(-)
diff -puN drivers/pnp/isapnp/core.c~pnp-remove-extra-0x100-bit-from-option-priority drivers/pnp/isapnp/core.c
--- a/drivers/pnp/isapnp/core.c~pnp-remove-extra-0x100-bit-from-option-priority
+++ a/drivers/pnp/isapnp/core.c
@@ -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:
diff -puN drivers/pnp/pnpacpi/rsparser.c~pnp-remove-extra-0x100-bit-from-option-priority drivers/pnp/pnpacpi/rsparser.c
--- a/drivers/pnp/pnpacpi/rsparser.c~pnp-remove-extra-0x100-bit-from-option-priority
+++ a/drivers/pnp/pnpacpi/rsparser.c
@@ -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;
diff -puN drivers/pnp/pnpbios/rsparser.c~pnp-remove-extra-0x100-bit-from-option-priority drivers/pnp/pnpbios/rsparser.c
--- a/drivers/pnp/pnpbios/rsparser.c~pnp-remove-extra-0x100-bit-from-option-priority
+++ a/drivers/pnp/pnpbios/rsparser.c
@@ -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;
_
Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are
linux-next.patch
mm-only-enforce-acpi-resource-conflict-checks.patch
pnp-set-the-pnp_card-dma_mask-for-use-by-isapnp-cards.patch
isa-set-24-bit-dma_mask-for-isa-devices.patch
make-pnp_add_card_id-static.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
