The patch titled
pnp: add detail to debug resource dump
has been removed from the -mm tree. Its filename was
pnp-add-detail-to-debug-resource-dump.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: add detail to debug resource dump
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
In the debug resource dump, decode the flags and indicate when a resource is
disabled or has been automatically assigned.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
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: Rene Herman <rene.herman@xxxxxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pnp/support.c | 34 ++++++++++++++++++++++++++--------
1 file changed, 26 insertions(+), 8 deletions(-)
diff -puN drivers/pnp/support.c~pnp-add-detail-to-debug-resource-dump drivers/pnp/support.c
--- a/drivers/pnp/support.c~pnp-add-detail-to-debug-resource-dump
+++ a/drivers/pnp/support.c
@@ -63,28 +63,46 @@ void dbg_pnp_show_resources(struct pnp_d
for (i = 0; i < PNP_MAX_IRQ; i++) {
res = pnp_get_resource(dev, IORESOURCE_IRQ, i);
if (res && !(res->flags & IORESOURCE_UNSET))
- dev_dbg(&dev->dev, " irq %lld flags %#lx\n",
- (unsigned long long) res->start, res->flags);
+ dev_dbg(&dev->dev, " irq %lld flags %#lx%s%s\n",
+ (unsigned long long) res->start, res->flags,
+ res->flags & IORESOURCE_DISABLED ?
+ " DISABLED" : "",
+ res->flags & IORESOURCE_AUTO ?
+ " AUTO" : "");
}
for (i = 0; i < PNP_MAX_DMA; i++) {
res = pnp_get_resource(dev, IORESOURCE_DMA, i);
if (res && !(res->flags & IORESOURCE_UNSET))
- dev_dbg(&dev->dev, " dma %lld flags %#lx\n",
- (unsigned long long) res->start, res->flags);
+ dev_dbg(&dev->dev, " dma %lld flags %#lx%s%s\n",
+ (unsigned long long) res->start, res->flags,
+ res->flags & IORESOURCE_DISABLED ?
+ " DISABLED" : "",
+ res->flags & IORESOURCE_AUTO ?
+ " AUTO" : "");
}
for (i = 0; i < PNP_MAX_PORT; i++) {
res = pnp_get_resource(dev, IORESOURCE_IO, i);
if (res && !(res->flags & IORESOURCE_UNSET))
- dev_dbg(&dev->dev, " io %#llx-%#llx flags %#lx\n",
+ dev_dbg(&dev->dev, " io %#llx-%#llx flags %#lx"
+ "%s%s\n",
(unsigned long long) res->start,
- (unsigned long long) res->end, res->flags);
+ (unsigned long long) res->end, res->flags,
+ res->flags & IORESOURCE_DISABLED ?
+ " DISABLED" : "",
+ res->flags & IORESOURCE_AUTO ?
+ " AUTO" : "");
}
for (i = 0; i < PNP_MAX_MEM; i++) {
res = pnp_get_resource(dev, IORESOURCE_MEM, i);
if (res && !(res->flags & IORESOURCE_UNSET))
- dev_dbg(&dev->dev, " mem %#llx-%#llx flags %#lx\n",
+ dev_dbg(&dev->dev, " mem %#llx-%#llx flags %#lx"
+ "%s%s\n",
(unsigned long long) res->start,
- (unsigned long long) res->end, res->flags);
+ (unsigned long long) res->end, res->flags,
+ res->flags & IORESOURCE_DISABLED ?
+ " DISABLED" : "",
+ res->flags & IORESOURCE_AUTO ?
+ " AUTO" : "");
}
#endif
}
_
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
