patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / ppc64 / kernel / vio.c

diff --git a/arch/ppc64/kernel/vio.c b/arch/ppc64/kernel/vio.c
index 817f315..78b05df 100644 (file)
--- a/arch/ppc64/kernel/vio.c
+++ b/arch/ppc64/kernel/vio.c
@@ -32,7 +32,9 @@
 
 extern struct subsystem devices_subsys; /* needed for vio_find_name() */
 
-struct iommu_table *vio_build_iommu_table(struct vio_dev *dev);
+static struct iommu_table *vio_build_iommu_table(struct vio_dev *);
+static const struct vio_device_id *vio_match_device(
+               const struct vio_device_id *, const struct vio_dev *);
 
 #ifdef CONFIG_PPC_PSERIES
 static int vio_num_address_cells;
@@ -136,15 +138,15 @@ EXPORT_SYMBOL(vio_unregister_driver);
  * system is in its list of supported devices. Returns the matching
  * vio_device_id structure or NULL if there is no match.
  */
-const struct vio_device_id * vio_match_device(const struct vio_device_id *ids,
+static const struct vio_device_id * vio_match_device(const struct vio_device_id *ids,
        const struct vio_dev *dev)
 {
        DBGENTER();
 
 #ifdef CONFIG_PPC_PSERIES
        while (ids->type) {
-               if ((strncmp(dev->archdata->type, ids->type, strlen(ids->type)) == 0) &&
-                       device_is_compatible((struct device_node*)dev->archdata, ids->compat))
+               if ((strncmp(((struct device_node *)dev->dev.platform_data)->type, ids->type, strlen(ids->type)) == 0) &&
+                       device_is_compatible(dev->dev.platform_data, ids->compat))
                        return ids;
                ids++;
        }
@@ -263,14 +265,21 @@ static void __devinit vio_dev_release(struct device *dev)
        DBGENTER();
 
        /* XXX free TCE table */
-       of_node_put(viodev->archdata);
+       of_node_put(viodev->dev.platform_data);
        kfree(viodev);
 }
 
+static ssize_t viodev_show_devspec(struct device *dev, char *buf)
+{
+       struct device_node *of_node = dev->platform_data;
+
+       return sprintf(buf, "%s\n", of_node->full_name);
+}
+DEVICE_ATTR(devspec, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_devspec, NULL);
+
 static ssize_t viodev_show_name(struct device *dev, char *buf)
 {
-       struct vio_dev *viodev = to_vio_dev(dev);
-       struct device_node *of_node = viodev->archdata;
+       struct device_node *of_node = dev->platform_data;
 
        return sprintf(buf, "%s\n", of_node->name);
 }
@@ -281,7 +290,7 @@ DEVICE_ATTR(name, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_name, NULL);
  * @of_node:   The OF node for this device.
  *
  * Creates and initializes a vio_dev structure from the data in
- * of_node (archdata) and adds it to the list of virtual devices.
+ * of_node (dev.platform_data) and adds it to the list of virtual devices.
  * Returns a pointer to the created vio_dev or NULL if node has
  * NULL device_type or compatible fields.
  */
@@ -315,7 +324,7 @@ struct vio_dev * __devinit vio_register_device(struct device_node *of_node)
        }
        memset(viodev, 0, sizeof(struct vio_dev));
 
-       viodev->archdata = (void *)of_node_get(of_node);
+       viodev->dev.platform_data = of_node_get(of_node);
        viodev->unit_address = *unit_address;
        viodev->iommu_table = vio_build_iommu_table(viodev);
 
@@ -345,6 +354,7 @@ struct vio_dev * __devinit vio_register_device(struct device_node *of_node)
                return NULL;
        }
        device_create_file(&viodev->dev, &dev_attr_name);
+       device_create_file(&viodev->dev, &dev_attr_devspec);
 
        return viodev;
 }
@@ -353,6 +363,8 @@ EXPORT_SYMBOL(vio_register_device);
 void __devinit vio_unregister_device(struct vio_dev *viodev)
 {
        DBGENTER();
+       device_remove_file(&viodev->dev, &dev_attr_devspec);
+       device_remove_file(&viodev->dev, &dev_attr_name);
        device_unregister(&viodev->dev);
 }
 EXPORT_SYMBOL(vio_unregister_device);
@@ -368,7 +380,7 @@ EXPORT_SYMBOL(vio_unregister_device);
 */
 const void * vio_get_attribute(struct vio_dev *vdev, void* which, int* length)
 {
-       return get_property((struct device_node *)vdev->archdata, (char*)which, length);
+       return get_property(vdev->dev.platform_data, (char*)which, length);
 }
 EXPORT_SYMBOL(vio_get_attribute);
 
@@ -415,7 +427,7 @@ EXPORT_SYMBOL(vio_find_node);
  * Returns a pointer to the built tce tree, or NULL if it can't
  * find property.
 */
-struct iommu_table * vio_build_iommu_table(struct vio_dev *dev)
+static struct iommu_table * vio_build_iommu_table(struct vio_dev *dev)
 {
        unsigned int *dma_window;
        struct iommu_table *newTceTable;
@@ -423,7 +435,7 @@ struct iommu_table * vio_build_iommu_table(struct vio_dev *dev)
        unsigned long size;
        int dma_window_property_size;
 
-       dma_window = (unsigned int *) get_property((struct device_node *)dev->archdata, "ibm,my-dma-window", &dma_window_property_size);
+       dma_window = (unsigned int *) get_property(dev->dev.platform_data, "ibm,my-dma-window", &dma_window_property_size);
        if(!dma_window) {
                return NULL;
        }