diff options
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/system.c | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c index fd17c7173c7b..2065e74bb63f 100644 --- a/drivers/pnp/system.c +++ b/drivers/pnp/system.c @@ -28,15 +28,15 @@ static void reserve_range(char *pnpid, int start, int end, int port) char *regionid; regionid = kmalloc(16, GFP_KERNEL); - if ( regionid == NULL ) + if (regionid == NULL) 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 ); + if (res == NULL) + kfree(regionid); else res->flags &= ~IORESOURCE_BUSY; /* @@ -47,24 +47,18 @@ static void reserve_range(char *pnpid, int start, int end, int port) printk(KERN_INFO "pnp: %s: %s range 0x%x-0x%x %s reserved\n", pnpid, port ? "ioport" : "iomem", start, end, - NULL != res ? "has been" : "could not be" - ); - - return; + NULL != res ? "has been" : "could not be"); } -static void reserve_resources_of_dev( struct pnp_dev *dev ) +static void reserve_resources_of_dev(struct pnp_dev *dev) { int i; - for (i=0;i<PNP_MAX_PORT;i++) { + for (i = 0; i < PNP_MAX_PORT; i++) { if (!pnp_port_valid(dev, i)) - /* end of resources */ continue; if (pnp_port_start(dev, i) == 0) - /* disabled */ - /* Do nothing */ - continue; + continue; /* disabled */ if (pnp_port_start(dev, i) < 0x100) /* * Below 0x100 is only standard PC hardware @@ -76,14 +70,10 @@ static void reserve_resources_of_dev( struct pnp_dev *dev ) */ continue; if (pnp_port_end(dev, i) < pnp_port_start(dev, i)) - /* invalid endpoint */ - /* Do nothing */ - continue; - reserve_range( - dev->dev.bus_id, - pnp_port_start(dev, i), - pnp_port_end(dev, i), 1 - ); + continue; /* invalid */ + + reserve_range(dev->dev.bus_id, pnp_port_start(dev, i), + pnp_port_end(dev, i), 1); } for (i = 0; i < PNP_MAX_MEM; i++) { |