redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

PNP: use dev_info() in system driver 

Use dev_info() for a little consistency.  Changes this:

    pnp: 00:01: ioport range 0xf50-0xf58 has been reserved
    pnp: 00:01: ioport range 0x408-0x40f has been reserved
    pnp: 00:01: ioport range 0x900-0x903 has been reserved

to this:

    system 00:01: ioport range 0xf50-0xf58 has been reserved
    system 00:01: ioport range 0x408-0x40f has been reserved
    system 00:01: ioport range 0x900-0x903 has been reserved

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
wifi-calibration
Bjorn Helgaas 2007-10-16 23:31:11 -07:00 committed by Linus Torvalds
parent a05d078169
commit b933e19d32
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/pnp/system.c
View File

@ -22,36 +22,39 @@ static const struct pnp_device_id pnp_dev_table[] = {
{"", 0}
};
static void reserve_range(const char *pnpid, resource_size_t start,
static void reserve_range(struct pnp_dev *dev, resource_size_t start,
resource_size_t end, int port)
{
struct resource *res;
char *regionid;
const char *pnpid = dev->dev.bus_id;
struct resource *res;
regionid = kmalloc(16, GFP_KERNEL);
if (regionid == NULL)
if (!regionid)
return;
snprintf(regionid, 16, "pnp %s", pnpid);
if (port)
res = request_region(start, end - start + 1, regionid);
else
res = request_mem_region(start, end - start + 1, regionid);
if (res == NULL)
kfree(regionid);
else
if (res)
res->flags &= ~IORESOURCE_BUSY;
else
kfree(regionid);
/*
* Failures at this point are usually harmless. pci quirks for
* example do reserve stuff they know about too, so we may well
* have double reservations.
*/
printk(KERN_INFO "pnp: %s: %s range 0x%llx-0x%llx %s reserved\n",
pnpid, port ? "ioport" : "iomem",
(unsigned long long)start, (unsigned long long)end,
NULL != res ? "has been" : "could not be");
dev_info(&dev->dev, "%s range 0x%llx-0x%llx %s reserved\n",
port ? "ioport" : "iomem",
(unsigned long long) start, (unsigned long long) end,
res ? "has been" : "could not be");
}
static void reserve_resources_of_dev(const struct pnp_dev *dev)
static void reserve_resources_of_dev(struct pnp_dev *dev)
{
int i;
@ -73,7 +76,7 @@ static void reserve_resources_of_dev(const struct pnp_dev *dev)
if (pnp_port_end(dev, i) < pnp_port_start(dev, i))
continue; /* invalid */
reserve_range(dev->dev.bus_id, pnp_port_start(dev, i),
reserve_range(dev, pnp_port_start(dev, i),
pnp_port_end(dev, i), 1);
}
@ -81,7 +84,7 @@ static void reserve_resources_of_dev(const struct pnp_dev *dev)
if (!pnp_mem_valid(dev, i))
continue;
reserve_range(dev->dev.bus_id, pnp_mem_start(dev, i),
reserve_range(dev, pnp_mem_start(dev, i),
pnp_mem_end(dev, i), 0);
}
}