pasemi_mac: Stop using the pci config space accessors for register read/writes

[linux-2.6-omap-h63xx.git] / drivers / pnp / core.c

diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index aec83ec5ea23f2471c55fbbe3dafd073b296c42e..d5964feb14de56d5c1dc5b7c9c1df1e8f9f447d0 100644 (file)
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -2,7 +2,6 @@
  * core.c - contains all core device and protocol registration functions
  *
  * Copyright 2002 Adam Belay <ambx1@neo.rr.com>
- *
  */
 
 #include <linux/pnp.h>
@@ -14,24 +13,31 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/dma-mapping.h>
 
 #include "base.h"
 
-
 static LIST_HEAD(pnp_protocols);
 LIST_HEAD(pnp_global);
 DEFINE_SPINLOCK(pnp_lock);
 
+/*
+ * ACPI or PNPBIOS should tell us about all platform devices, so we can
+ * skip some blind probes.  ISAPNP typically enumerates only plug-in ISA
+ * devices, not built-in things like COM ports.
+ */
+int pnp_platform_devices;
+EXPORT_SYMBOL(pnp_platform_devices);
+
 void *pnp_alloc(long size)
 {
        void *result;
 
-       result = kmalloc(size, GFP_KERNEL);
-       if (!result){
+       result = kzalloc(size, GFP_KERNEL);
+       if (!result) {
                printk(KERN_ERR "pnp: Out of Memory\n");
                return NULL;
        }
-       memset(result, 0, size);
        return result;
 }
 
@@ -41,14 +47,10 @@ void *pnp_alloc(long size)
  *
  *  Ex protocols: ISAPNP, PNPBIOS, etc
  */
-
 int pnp_register_protocol(struct pnp_protocol *protocol)
 {
        int nodenum;
-       struct list_head * pos;
-
-       if (!protocol)
-               return -EINVAL;
+       struct list_head *pos;
 
        INIT_LIST_HEAD(&protocol->devices);
        INIT_LIST_HEAD(&protocol->cards);
@@ -56,9 +58,9 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
        spin_lock(&pnp_lock);
 
        /* assign the lowest unused number */
-       list_for_each(pos,&pnp_protocols) {
-               struct pnp_protocol * cur = to_pnp_protocol(pos);
-               if (cur->number == nodenum){
+       list_for_each(pos, &pnp_protocols) {
+               struct pnp_protocol *cur = to_pnp_protocol(pos);
+               if (cur->number == nodenum) {
                        pos = &pnp_protocols;
                        nodenum++;
                }
@@ -75,7 +77,6 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
 /**
  * pnp_protocol_unregister - removes a pnp protocol from the pnp layer
  * @protocol: pointer to the corresponding pnp_protocol structure
- *
  */
 void pnp_unregister_protocol(struct pnp_protocol *protocol)
 {
@@ -85,13 +86,11 @@ void pnp_unregister_protocol(struct pnp_protocol *protocol)
        device_unregister(&protocol->dev);
 }
 
-
 static void pnp_free_ids(struct pnp_dev *dev)
 {
-       struct pnp_id * id;
-       struct pnp_id * next;
-       if (!dev)
-               return;
+       struct pnp_id *id;
+       struct pnp_id *next;
+
        id = dev->id;
        while (id) {
                next = id->next;
@@ -102,7 +101,8 @@ static void pnp_free_ids(struct pnp_dev *dev)
 
 static void pnp_release_device(struct device *dmdev)
 {
-       struct pnp_dev * dev = to_pnp_dev(dmdev);
+       struct pnp_dev *dev = to_pnp_dev(dmdev);
+
        pnp_free_option(dev->independent);
        pnp_free_option(dev->dependent);
        pnp_free_ids(dev);
@@ -112,8 +112,11 @@ static void pnp_release_device(struct device *dmdev)
 int __pnp_add_device(struct pnp_dev *dev)
 {
        int ret;
+
        pnp_fixup_device(dev);
        dev->dev.bus = &pnp_bus_type;
+       dev->dev.dma_mask = &dev->dma_mask;
+       dev->dma_mask = dev->dev.coherent_dma_mask = DMA_24BIT_MASK;
        dev->dev.release = &pnp_release_device;
        dev->status = PNP_READY;
        spin_lock(&pnp_lock);
@@ -133,13 +136,13 @@ int __pnp_add_device(struct pnp_dev *dev)
  *
  *  adds to driver model, name database, fixups, interface, etc.
  */
-
 int pnp_add_device(struct pnp_dev *dev)
 {
-       if (!dev || !dev->protocol || dev->card)
+       if (dev->card)
                return -EINVAL;
        dev->dev.parent = &dev->protocol->dev;
-       sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number, dev->number);
+       sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
+               dev->number);
        return __pnp_add_device(dev);
 }
 
@@ -152,21 +155,6 @@ void __pnp_remove_device(struct pnp_dev *dev)
        device_unregister(&dev->dev);
 }
 
-/**
- * pnp_remove_device - removes a pnp device from the pnp layer
- * @dev: pointer to dev to add
- *
- * this function will free all mem used by dev
- */
-#if 0
-void pnp_remove_device(struct pnp_dev *dev)
-{
-       if (!dev || dev->card)
-               return;
-       __pnp_remove_device(dev);
-}
-#endif  /*  0  */
-
 static int __init pnp_init(void)
 {
        printk(KERN_INFO "Linux Plug and Play Support v0.97 (c) Adam Belay\n");
@@ -174,10 +162,3 @@ static int __init pnp_init(void)
 }
 
 subsys_initcall(pnp_init);
-
-#if 0
-EXPORT_SYMBOL(pnp_register_protocol);
-EXPORT_SYMBOL(pnp_unregister_protocol);
-EXPORT_SYMBOL(pnp_add_device);
-EXPORT_SYMBOL(pnp_remove_device);
-#endif  /*  0  */