PNP: add pnp_get_pnp_resource()
[safe/jmp/linux-2.6] / drivers / pnp / manager.c
index 6fff109..4823da2 100644 (file)
@@ -1,12 +1,10 @@
 /*
  * manager.c - Resource Management, Conflict Resolution, Activation and Disabling of Devices
  *
- * based on isapnp.c resource management (c) Jaroslav Kysela <perex@suse.cz>
+ * based on isapnp.c resource management (c) Jaroslav Kysela <perex@perex.cz>
  * Copyright 2003 Adam Belay <ambx1@neo.rr.com>
- *
  */
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pnp.h>
 #include <linux/slab.h>
 #include <linux/bitmap.h>
+#include <linux/mutex.h>
 #include "base.h"
 
-DECLARE_MUTEX(pnp_res_mutex);
+DEFINE_MUTEX(pnp_res_mutex);
 
 static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
 {
-       unsigned long *start, *end, *flags;
-
-       if (!dev || !rule)
-               return -EINVAL;
+       struct resource *res;
 
-       if (idx >= PNP_MAX_PORT) {
-               pnp_err("More than 4 ports is incompatible with pnp specifications.");
+       res = pnp_get_resource(dev, IORESOURCE_IO, idx);
+       if (!res) {
+               dev_err(&dev->dev, "too many I/O port resources\n");
                /* pretend we were successful so at least the manager won't try again */
                return 1;
        }
 
        /* check if this resource has been manually set, if so skip */
-       if (!(dev->res.port_resource[idx].flags & IORESOURCE_AUTO))
+       if (!(res->flags & IORESOURCE_AUTO)) {
+               dev_dbg(&dev->dev, "  io %d already set to %#llx-%#llx "
+                       "flags %#lx\n", idx, (unsigned long long) res->start,
+                       (unsigned long long) res->end, res->flags);
                return 1;
-
-       start = &dev->res.port_resource[idx].start;
-       end = &dev->res.port_resource[idx].end;
-       flags = &dev->res.port_resource[idx].flags;
+       }
 
        /* set the initial values */
-       *flags |= rule->flags | IORESOURCE_IO;
-       *flags &=  ~IORESOURCE_UNSET;
+       res->flags |= rule->flags | IORESOURCE_IO;
+       res->flags &= ~IORESOURCE_UNSET;
 
        if (!rule->size) {
-               *flags |= IORESOURCE_DISABLED;
-               return 1; /* skip disabled resource requests */
+               res->flags |= IORESOURCE_DISABLED;
+               dev_dbg(&dev->dev, "  io %d disabled\n", idx);
+               return 1;       /* skip disabled resource requests */
        }
 
-       *start = rule->min;
-       *end = *start + rule->size - 1;
+       res->start = rule->min;
+       res->end = res->start + rule->size - 1;
 
        /* run through until pnp_check_port is happy */
-       while (!pnp_check_port(dev, idx)) {
-               *start += rule->align;
-               *end = *start + rule->size - 1;
-               if (*start > rule->max || !rule->align)
+       while (!pnp_check_port(dev, res)) {
+               res->start += rule->align;
+               res->end = res->start + rule->size - 1;
+               if (res->start > rule->max || !rule->align) {
+                       dev_dbg(&dev->dev, "  couldn't assign io %d\n", idx);
                        return 0;
+               }
        }
+       dev_dbg(&dev->dev, "  assign io  %d %#llx-%#llx\n", idx,
+               (unsigned long long) res->start, (unsigned long long) res->end);
        return 1;
 }
 
 static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
 {
-       unsigned long *start, *end, *flags;
+       struct resource *res;
 
-       if (!dev || !rule)
-               return -EINVAL;
-
-       if (idx >= PNP_MAX_MEM) {
-               pnp_err("More than 8 mems is incompatible with pnp specifications.");
+       res = pnp_get_resource(dev, IORESOURCE_MEM, idx);
+       if (!res) {
+               dev_err(&dev->dev, "too many memory resources\n");
                /* pretend we were successful so at least the manager won't try again */
                return 1;
        }
 
        /* check if this resource has been manually set, if so skip */
-       if (!(dev->res.mem_resource[idx].flags & IORESOURCE_AUTO))
+       if (!(res->flags & IORESOURCE_AUTO)) {
+               dev_dbg(&dev->dev, "  mem %d already set to %#llx-%#llx "
+                       "flags %#lx\n", idx, (unsigned long long) res->start,
+                       (unsigned long long) res->end, res->flags);
                return 1;
-
-       start = &dev->res.mem_resource[idx].start;
-       end = &dev->res.mem_resource[idx].end;
-       flags = &dev->res.mem_resource[idx].flags;
+       }
 
        /* set the initial values */
-       *flags |= rule->flags | IORESOURCE_MEM;
-       *flags &=  ~IORESOURCE_UNSET;
+       res->flags |= rule->flags | IORESOURCE_MEM;
+       res->flags &= ~IORESOURCE_UNSET;
 
        /* convert pnp flags to standard Linux flags */
        if (!(rule->flags & IORESOURCE_MEM_WRITEABLE))
-               *flags |= IORESOURCE_READONLY;
+               res->flags |= IORESOURCE_READONLY;
        if (rule->flags & IORESOURCE_MEM_CACHEABLE)
-               *flags |= IORESOURCE_CACHEABLE;
+               res->flags |= IORESOURCE_CACHEABLE;
        if (rule->flags & IORESOURCE_MEM_RANGELENGTH)
-               *flags |= IORESOURCE_RANGELENGTH;
+               res->flags |= IORESOURCE_RANGELENGTH;
        if (rule->flags & IORESOURCE_MEM_SHADOWABLE)
-               *flags |= IORESOURCE_SHADOWABLE;
+               res->flags |= IORESOURCE_SHADOWABLE;
 
        if (!rule->size) {
-               *flags |= IORESOURCE_DISABLED;
-               return 1; /* skip disabled resource requests */
+               res->flags |= IORESOURCE_DISABLED;
+               dev_dbg(&dev->dev, "  mem %d disabled\n", idx);
+               return 1;       /* skip disabled resource requests */
        }
 
-       *start = rule->min;
-       *end = *start + rule->size -1;
+       res->start = rule->min;
+       res->end = res->start + rule->size - 1;
 
        /* run through until pnp_check_mem is happy */
-       while (!pnp_check_mem(dev, idx)) {
-               *start += rule->align;
-               *end = *start + rule->size - 1;
-               if (*start > rule->max || !rule->align)
+       while (!pnp_check_mem(dev, res)) {
+               res->start += rule->align;
+               res->end = res->start + rule->size - 1;
+               if (res->start > rule->max || !rule->align) {
+                       dev_dbg(&dev->dev, "  couldn't assign mem %d\n", idx);
                        return 0;
+               }
        }
+       dev_dbg(&dev->dev, "  assign mem %d %#llx-%#llx\n", idx,
+               (unsigned long long) res->start, (unsigned long long) res->end);
        return 1;
 }
 
-static int pnp_assign_irq(struct pnp_dev * dev, struct pnp_irq *rule, int idx)
+static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
 {
-       unsigned long *start, *end, *flags;
+       struct resource *res;
        int i;
 
        /* IRQ priority: this table is good for i386 */
@@ -124,51 +129,55 @@ static int pnp_assign_irq(struct pnp_dev * dev, struct pnp_irq *rule, int idx)
                5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
        };
 
-       if (!dev || !rule)
-               return -EINVAL;
-
-       if (idx >= PNP_MAX_IRQ) {
-               pnp_err("More than 2 irqs is incompatible with pnp specifications.");
+       res = pnp_get_resource(dev, IORESOURCE_IRQ, idx);
+       if (!res) {
+               dev_err(&dev->dev, "too many IRQ resources\n");
                /* pretend we were successful so at least the manager won't try again */
                return 1;
        }
 
        /* check if this resource has been manually set, if so skip */
-       if (!(dev->res.irq_resource[idx].flags & IORESOURCE_AUTO))
+       if (!(res->flags & IORESOURCE_AUTO)) {
+               dev_dbg(&dev->dev, "  irq %d already set to %d flags %#lx\n",
+                       idx, (int) res->start, res->flags);
                return 1;
-
-       start = &dev->res.irq_resource[idx].start;
-       end = &dev->res.irq_resource[idx].end;
-       flags = &dev->res.irq_resource[idx].flags;
+       }
 
        /* set the initial values */
-       *flags |= rule->flags | IORESOURCE_IRQ;
-       *flags &=  ~IORESOURCE_UNSET;
+       res->flags |= rule->flags | IORESOURCE_IRQ;
+       res->flags &= ~IORESOURCE_UNSET;
 
        if (bitmap_empty(rule->map, PNP_IRQ_NR)) {
-               *flags |= IORESOURCE_DISABLED;
-               return 1; /* skip disabled resource requests */
+               res->flags |= IORESOURCE_DISABLED;
+               dev_dbg(&dev->dev, "  irq %d disabled\n", idx);
+               return 1;       /* skip disabled resource requests */
        }
 
        /* TBD: need check for >16 IRQ */
-       *start = find_next_bit(rule->map, PNP_IRQ_NR, 16);
-       if (*start < PNP_IRQ_NR) {
-               *end = *start;
+       res->start = find_next_bit(rule->map, PNP_IRQ_NR, 16);
+       if (res->start < PNP_IRQ_NR) {
+               res->end = res->start;
+               dev_dbg(&dev->dev, "  assign irq %d %d\n", idx,
+                       (int) res->start);
                return 1;
        }
        for (i = 0; i < 16; i++) {
-               if(test_bit(xtab[i], rule->map)) {
-                       *start = *end = xtab[i];
-                       if(pnp_check_irq(dev, idx))
+               if (test_bit(xtab[i], rule->map)) {
+                       res->start = res->end = xtab[i];
+                       if (pnp_check_irq(dev, res)) {
+                               dev_dbg(&dev->dev, "  assign irq %d %d\n", idx,
+                                       (int) res->start);
                                return 1;
+                       }
                }
        }
+       dev_dbg(&dev->dev, "  couldn't assign irq %d\n", idx);
        return 0;
 }
 
-static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
+static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 {
-       unsigned long *start, *end, *flags;
+       struct resource *res;
        int i;
 
        /* DMA priority: this table is good for i386 */
@@ -176,111 +185,125 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                1, 3, 5, 6, 7, 0, 2, 4
        };
 
-       if (!dev || !rule)
-               return -EINVAL;
-
-       if (idx >= PNP_MAX_DMA) {
-               pnp_err("More than 2 dmas is incompatible with pnp specifications.");
-               /* pretend we were successful so at least the manager won't try again */
-               return 1;
+       res = pnp_get_resource(dev, IORESOURCE_DMA, idx);
+       if (!res) {
+               dev_err(&dev->dev, "too many DMA resources\n");
+               return;
        }
 
        /* check if this resource has been manually set, if so skip */
-       if (!(dev->res.dma_resource[idx].flags & IORESOURCE_AUTO))
-               return 1;
-
-       start = &dev->res.dma_resource[idx].start;
-       end = &dev->res.dma_resource[idx].end;
-       flags = &dev->res.dma_resource[idx].flags;
+       if (!(res->flags & IORESOURCE_AUTO)) {
+               dev_dbg(&dev->dev, "  dma %d already set to %d flags %#lx\n",
+                       idx, (int) res->start, res->flags);
+               return;
+       }
 
        /* set the initial values */
-       *flags |= rule->flags | IORESOURCE_DMA;
-       *flags &=  ~IORESOURCE_UNSET;
-
-       if (!rule->map) {
-               *flags |= IORESOURCE_DISABLED;
-               return 1; /* skip disabled resource requests */
-       }
+       res->flags |= rule->flags | IORESOURCE_DMA;
+       res->flags &= ~IORESOURCE_UNSET;
 
        for (i = 0; i < 8; i++) {
-               if(rule->map & (1<<xtab[i])) {
-                       *start = *end = xtab[i];
-                       if(pnp_check_dma(dev, idx))
-                               return 1;
+               if (rule->map & (1 << xtab[i])) {
+                       res->start = res->end = xtab[i];
+                       if (pnp_check_dma(dev, res)) {
+                               dev_dbg(&dev->dev, "  assign dma %d %d\n", idx,
+                                       (int) res->start);
+                               return;
+                       }
                }
        }
-       return 0;
+#ifdef MAX_DMA_CHANNELS
+       res->start = res->end = MAX_DMA_CHANNELS;
+#endif
+       res->flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED;
+       dev_dbg(&dev->dev, "  disable dma %d\n", idx);
+}
+
+void pnp_init_resource(struct resource *res)
+{
+       unsigned long type;
+
+       type = res->flags & (IORESOURCE_IO  | IORESOURCE_MEM |
+                            IORESOURCE_IRQ | IORESOURCE_DMA);
+
+       res->name = NULL;
+       res->flags = type | IORESOURCE_AUTO | IORESOURCE_UNSET;
+       if (type == IORESOURCE_IRQ || type == IORESOURCE_DMA) {
+               res->start = -1;
+               res->end = -1;
+       } else {
+               res->start = 0;
+               res->end = 0;
+       }
 }
 
 /**
  * pnp_init_resources - Resets a resource table to default values.
  * @table: pointer to the desired resource table
- *
  */
-void pnp_init_resource_table(struct pnp_resource_table *table)
+void pnp_init_resources(struct pnp_dev *dev)
 {
+       struct resource *res;
        int idx;
+
        for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
-               table->irq_resource[idx].name = NULL;
-               table->irq_resource[idx].start = -1;
-               table->irq_resource[idx].end = -1;
-               table->irq_resource[idx].flags = IORESOURCE_IRQ | IORESOURCE_AUTO | IORESOURCE_UNSET;
+               res = &dev->res->irq[idx].res;
+               res->flags = IORESOURCE_IRQ;
+               pnp_init_resource(res);
        }
        for (idx = 0; idx < PNP_MAX_DMA; idx++) {
-               table->dma_resource[idx].name = NULL;
-               table->dma_resource[idx].start = -1;
-               table->dma_resource[idx].end = -1;
-               table->dma_resource[idx].flags = IORESOURCE_DMA | IORESOURCE_AUTO | IORESOURCE_UNSET;
+               res = &dev->res->dma[idx].res;
+               res->flags = IORESOURCE_DMA;
+               pnp_init_resource(res);
        }
        for (idx = 0; idx < PNP_MAX_PORT; idx++) {
-               table->port_resource[idx].name = NULL;
-               table->port_resource[idx].start = 0;
-               table->port_resource[idx].end = 0;
-               table->port_resource[idx].flags = IORESOURCE_IO | IORESOURCE_AUTO | IORESOURCE_UNSET;
+               res = &dev->res->port[idx].res;
+               res->flags = IORESOURCE_IO;
+               pnp_init_resource(res);
        }
        for (idx = 0; idx < PNP_MAX_MEM; idx++) {
-               table->mem_resource[idx].name = NULL;
-               table->mem_resource[idx].start = 0;
-               table->mem_resource[idx].end = 0;
-               table->mem_resource[idx].flags = IORESOURCE_MEM | IORESOURCE_AUTO | IORESOURCE_UNSET;
+               res = &dev->res->mem[idx].res;
+               res->flags = IORESOURCE_MEM;
+               pnp_init_resource(res);
        }
 }
 
 /**
  * pnp_clean_resources - clears resources that were not manually set
  * @res: the resources to clean
- *
  */
-static void pnp_clean_resource_table(struct pnp_resource_table * res)
+static void pnp_clean_resource_table(struct pnp_dev *dev)
 {
+       struct resource *res;
        int idx;
+
        for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
-               if (!(res->irq_resource[idx].flags & IORESOURCE_AUTO))
-                       continue;
-               res->irq_resource[idx].start = -1;
-               res->irq_resource[idx].end = -1;
-               res->irq_resource[idx].flags = IORESOURCE_IRQ | IORESOURCE_AUTO | IORESOURCE_UNSET;
+               res = &dev->res->irq[idx].res;
+               if (res->flags & IORESOURCE_AUTO) {
+                       res->flags = IORESOURCE_IRQ;
+                       pnp_init_resource(res);
+               }
        }
        for (idx = 0; idx < PNP_MAX_DMA; idx++) {
-               if (!(res->dma_resource[idx].flags & IORESOURCE_AUTO))
-                       continue;
-               res->dma_resource[idx].start = -1;
-               res->dma_resource[idx].end = -1;
-               res->dma_resource[idx].flags = IORESOURCE_DMA | IORESOURCE_AUTO | IORESOURCE_UNSET;
+               res = &dev->res->dma[idx].res;
+               if (res->flags & IORESOURCE_AUTO) {
+                       res->flags = IORESOURCE_DMA;
+                       pnp_init_resource(res);
+               }
        }
        for (idx = 0; idx < PNP_MAX_PORT; idx++) {
-               if (!(res->port_resource[idx].flags & IORESOURCE_AUTO))
-                       continue;
-               res->port_resource[idx].start = 0;
-               res->port_resource[idx].end = 0;
-               res->port_resource[idx].flags = IORESOURCE_IO | IORESOURCE_AUTO | IORESOURCE_UNSET;
+               res = &dev->res->port[idx].res;
+               if (res->flags & IORESOURCE_AUTO) {
+                       res->flags = IORESOURCE_IO;
+                       pnp_init_resource(res);
+               }
        }
        for (idx = 0; idx < PNP_MAX_MEM; idx++) {
-               if (!(res->mem_resource[idx].flags & IORESOURCE_AUTO))
-                       continue;
-               res->mem_resource[idx].start = 0;
-               res->mem_resource[idx].end = 0;
-               res->mem_resource[idx].flags = IORESOURCE_MEM | IORESOURCE_AUTO | IORESOURCE_UNSET;
+               res = &dev->res->mem[idx].res;
+               if (res->flags & IORESOURCE_AUTO) {
+                       res->flags = IORESOURCE_MEM;
+                       pnp_init_resource(res);
+               }
        }
 }
 
@@ -302,9 +325,11 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
        if (!pnp_can_configure(dev))
                return -ENODEV;
 
-       down(&pnp_res_mutex);
-       pnp_clean_resource_table(&dev->res); /* start with a fresh slate */
+       dbg_pnp_show_resources(dev, "before pnp_assign_resources");
+       mutex_lock(&pnp_res_mutex);
+       pnp_clean_resource_table(dev);
        if (dev->independent) {
+               dev_dbg(&dev->dev, "assigning independent options\n");
                port = dev->independent->port;
                mem = dev->independent->mem;
                irq = dev->independent->irq;
@@ -328,8 +353,7 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
                        irq = irq->next;
                }
                while (dma) {
-                       if (!pnp_assign_dma(dev, dma, ndma))
-                               goto fail;
+                       pnp_assign_dma(dev, dma, ndma);
                        ndma++;
                        dma = dma->next;
                }
@@ -338,10 +362,13 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
        if (depnum) {
                struct pnp_option *dep;
                int i;
-               for (i=1,dep=dev->dependent; i<depnum; i++, dep=dep->next)
-                       if(!dep)
+
+               dev_dbg(&dev->dev, "assigning dependent option %d\n", depnum);
+               for (i = 1, dep = dev->dependent; i < depnum;
+                    i++, dep = dep->next)
+                       if (!dep)
                                goto fail;
-               port =dep->port;
+               port = dep->port;
                mem = dep->mem;
                irq = dep->irq;
                dma = dep->dma;
@@ -364,91 +391,35 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
                        irq = irq->next;
                }
                while (dma) {
-                       if (!pnp_assign_dma(dev, dma, ndma))
-                               goto fail;
+                       pnp_assign_dma(dev, dma, ndma);
                        ndma++;
                        dma = dma->next;
                }
        } else if (dev->dependent)
                goto fail;
 
-       up(&pnp_res_mutex);
+       mutex_unlock(&pnp_res_mutex);
+       dbg_pnp_show_resources(dev, "after pnp_assign_resources");
        return 1;
 
 fail:
-       pnp_clean_resource_table(&dev->res);
-       up(&pnp_res_mutex);
+       pnp_clean_resource_table(dev);
+       mutex_unlock(&pnp_res_mutex);
+       dbg_pnp_show_resources(dev, "after pnp_assign_resources (failed)");
        return 0;
 }
 
 /**
- * pnp_manual_config_dev - Disables Auto Config and Manually sets the resource table
- * @dev: pointer to the desired device
- * @res: pointer to the new resource config
- * @mode: 0 or PNP_CONFIG_FORCE
- *
- * This function can be used by drivers that want to manually set thier resources.
- */
-int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table * res, int mode)
-{
-       int i;
-       struct pnp_resource_table * bak;
-       if (!dev || !res)
-               return -EINVAL;
-       if (!pnp_can_configure(dev))
-               return -ENODEV;
-       bak = pnp_alloc(sizeof(struct pnp_resource_table));
-       if (!bak)
-               return -ENOMEM;
-       *bak = dev->res;
-
-       down(&pnp_res_mutex);
-       dev->res = *res;
-       if (!(mode & PNP_CONFIG_FORCE)) {
-               for (i = 0; i < PNP_MAX_PORT; i++) {
-                       if(!pnp_check_port(dev,i))
-                               goto fail;
-               }
-               for (i = 0; i < PNP_MAX_MEM; i++) {
-                       if(!pnp_check_mem(dev,i))
-                               goto fail;
-               }
-               for (i = 0; i < PNP_MAX_IRQ; i++) {
-                       if(!pnp_check_irq(dev,i))
-                               goto fail;
-               }
-               for (i = 0; i < PNP_MAX_DMA; i++) {
-                       if(!pnp_check_dma(dev,i))
-                               goto fail;
-               }
-       }
-       up(&pnp_res_mutex);
-
-       kfree(bak);
-       return 0;
-
-fail:
-       dev->res = *bak;
-       up(&pnp_res_mutex);
-       kfree(bak);
-       return -EINVAL;
-}
-
-/**
  * pnp_auto_config_dev - automatically assigns resources to a device
  * @dev: pointer to the desired device
- *
  */
 int pnp_auto_config_dev(struct pnp_dev *dev)
 {
        struct pnp_option *dep;
        int i = 1;
 
-       if(!dev)
-               return -EINVAL;
-
-       if(!pnp_can_configure(dev)) {
-               pnp_info("Device %s does not support resource configuration.", dev->dev.bus_id);
+       if (!pnp_can_configure(dev)) {
+               dev_dbg(&dev->dev, "configuration not supported\n");
                return -ENODEV;
        }
 
@@ -465,7 +436,7 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
                } while (dep);
        }
 
-       pnp_err("Unable to assign resources to device %s.", dev->dev.bus_id);
+       dev_err(&dev->dev, "unable to assign resources\n");
        return -EBUSY;
 }
 
@@ -473,23 +444,22 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
  * pnp_start_dev - low-level start of the PnP device
  * @dev: pointer to the desired device
  *
- * assumes that resources have alread been allocated
+ * assumes that resources have already been allocated
  */
-
 int pnp_start_dev(struct pnp_dev *dev)
 {
        if (!pnp_can_write(dev)) {
-               pnp_info("Device %s does not support activation.", dev->dev.bus_id);
+               dev_dbg(&dev->dev, "activation not supported\n");
                return -EINVAL;
        }
 
-       if (dev->protocol->set(dev, &dev->res)<0) {
-               pnp_err("Failed to activate device %s.", dev->dev.bus_id);
+       dbg_pnp_show_resources(dev, "pnp_start_dev");
+       if (dev->protocol->set(dev) < 0) {
+               dev_err(&dev->dev, "activation failed\n");
                return -EIO;
        }
 
-       pnp_info("Device %s activated.", dev->dev.bus_id);
-
+       dev_info(&dev->dev, "activated\n");
        return 0;
 }
 
@@ -499,20 +469,18 @@ int pnp_start_dev(struct pnp_dev *dev)
  *
  * does not free resources
  */
-
 int pnp_stop_dev(struct pnp_dev *dev)
 {
        if (!pnp_can_disable(dev)) {
-               pnp_info("Device %s does not support disabling.", dev->dev.bus_id);
+               dev_dbg(&dev->dev, "disabling not supported\n");
                return -EINVAL;
        }
-       if (dev->protocol->disable(dev)<0) {
-               pnp_err("Failed to disable device %s.", dev->dev.bus_id);
+       if (dev->protocol->disable(dev) < 0) {
+               dev_err(&dev->dev, "disable failed\n");
                return -EIO;
        }
 
-       pnp_info("Device %s disabled.", dev->dev.bus_id);
-
+       dev_info(&dev->dev, "disabled\n");
        return 0;
 }
 
@@ -526,11 +494,8 @@ int pnp_activate_dev(struct pnp_dev *dev)
 {
        int error;
 
-       if (!dev)
-               return -EINVAL;
-       if (dev->active) {
-               return 0; /* the device is already active */
-       }
+       if (dev->active)
+               return 0;
 
        /* ensure resources are allocated */
        if (pnp_auto_config_dev(dev))
@@ -541,8 +506,7 @@ int pnp_activate_dev(struct pnp_dev *dev)
                return error;
 
        dev->active = 1;
-
-       return 1;
+       return 0;
 }
 
 /**
@@ -555,11 +519,8 @@ int pnp_disable_dev(struct pnp_dev *dev)
 {
        int error;
 
-        if (!dev)
-                return -EINVAL;
-       if (!dev->active) {
-               return 0; /* the device is already disabled */
-       }
+       if (!dev->active)
+               return 0;
 
        error = pnp_stop_dev(dev);
        if (error)
@@ -568,37 +529,14 @@ int pnp_disable_dev(struct pnp_dev *dev)
        dev->active = 0;
 
        /* release the resources so that other devices can use them */
-       down(&pnp_res_mutex);
-       pnp_clean_resource_table(&dev->res);
-       up(&pnp_res_mutex);
+       mutex_lock(&pnp_res_mutex);
+       pnp_clean_resource_table(dev);
+       mutex_unlock(&pnp_res_mutex);
 
-       return 1;
-}
-
-/**
- * pnp_resource_change - change one resource
- * @resource: pointer to resource to be changed
- * @start: start of region
- * @size: size of region
- *
- */
-void pnp_resource_change(struct resource *resource, unsigned long start, unsigned long size)
-{
-       if (resource == NULL)
-               return;
-       resource->flags &= ~(IORESOURCE_AUTO | IORESOURCE_UNSET);
-       resource->start = start;
-       resource->end = start + size - 1;
+       return 0;
 }
 
-
-EXPORT_SYMBOL(pnp_manual_config_dev);
-#if 0
-EXPORT_SYMBOL(pnp_auto_config_dev);
-#endif
 EXPORT_SYMBOL(pnp_start_dev);
 EXPORT_SYMBOL(pnp_stop_dev);
 EXPORT_SYMBOL(pnp_activate_dev);
 EXPORT_SYMBOL(pnp_disable_dev);
-EXPORT_SYMBOL(pnp_resource_change);
-EXPORT_SYMBOL(pnp_init_resource_table);