git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin' into secretlab/next-devicetree
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
vio.c
diff --git
a/arch/powerpc/kernel/vio.c
b/arch/powerpc/kernel/vio.c
index
9ce7b62
..
00b9436
100644
(file)
--- a/
arch/powerpc/kernel/vio.c
+++ b/
arch/powerpc/kernel/vio.c
@@
-707,7
+707,7
@@
static int vio_cmo_bus_probe(struct vio_dev *viodev)
* Check to see that device has a DMA window and configure
* entitlement for the device.
*/
* Check to see that device has a DMA window and configure
* entitlement for the device.
*/
- if (of_get_property(viodev->dev.
archdata.
of_node,
+ if (of_get_property(viodev->dev.of_node,
"ibm,my-dma-window", NULL)) {
/* Check that the driver is CMO enabled and get desired DMA */
if (!viodrv->get_desired_dma) {
"ibm,my-dma-window", NULL)) {
/* Check that the driver is CMO enabled and get desired DMA */
if (!viodrv->get_desired_dma) {
@@
-1054,7
+1054,7
@@
static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
if (firmware_has_feature(FW_FEATURE_ISERIES))
return vio_build_iommu_table_iseries(dev);
if (firmware_has_feature(FW_FEATURE_ISERIES))
return vio_build_iommu_table_iseries(dev);
- dma_window = of_get_property(dev->dev.
archdata.
of_node,
+ dma_window = of_get_property(dev->dev.of_node,
"ibm,my-dma-window", NULL);
if (!dma_window)
return NULL;
"ibm,my-dma-window", NULL);
if (!dma_window)
return NULL;
@@
-1063,7
+1063,7
@@
static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
if (tbl == NULL)
return NULL;
if (tbl == NULL)
return NULL;
- of_parse_dma_window(dev->dev.
archdata.
of_node, dma_window,
+ of_parse_dma_window(dev->dev.of_node, dma_window,
&tbl->it_index, &offset, &size);
/* TCE table size - measured in tce entries */
&tbl->it_index, &offset, &size);
/* TCE table size - measured in tce entries */
@@
-1091,7
+1091,7
@@
static const struct vio_device_id *vio_match_device(
{
while (ids->type[0] != '\0') {
if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
{
while (ids->type[0] != '\0') {
if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
- of_device_is_compatible(dev->dev.
archdata.
of_node,
+ of_device_is_compatible(dev->dev.of_node,
ids->compat))
return ids;
ids++;
ids->compat))
return ids;
ids++;
@@
-1184,7
+1184,7
@@
EXPORT_SYMBOL(vio_unregister_driver);
static void __devinit vio_dev_release(struct device *dev)
{
/* XXX should free TCE table */
static void __devinit vio_dev_release(struct device *dev)
{
/* XXX should free TCE table */
- of_node_put(dev->
archdata.
of_node);
+ of_node_put(dev->of_node);
kfree(to_vio_dev(dev));
}
kfree(to_vio_dev(dev));
}
@@
-1235,7
+1235,7
@@
struct vio_dev *vio_register_device_node(struct device_node *of_node)
if (unit_address != NULL)
viodev->unit_address = *unit_address;
}
if (unit_address != NULL)
viodev->unit_address = *unit_address;
}
- viodev->dev.
archdata.
of_node = of_node_get(of_node);
+ viodev->dev.of_node = of_node_get(of_node);
if (firmware_has_feature(FW_FEATURE_CMO))
vio_cmo_set_dma_ops(viodev);
if (firmware_has_feature(FW_FEATURE_CMO))
vio_cmo_set_dma_ops(viodev);
@@
-1320,7
+1320,7
@@
static ssize_t name_show(struct device *dev,
static ssize_t devspec_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
static ssize_t devspec_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
- struct device_node *of_node = dev->
archdata.
of_node;
+ struct device_node *of_node = dev->of_node;
return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none");
}
return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none");
}
@@
-1332,7
+1332,7
@@
static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
struct device_node *dn;
const char *cp;
struct device_node *dn;
const char *cp;
- dn = dev->
archdata.
of_node;
+ dn = dev->of_node;
if (!dn)
return -ENODEV;
cp = of_get_property(dn, "compatible", NULL);
if (!dn)
return -ENODEV;
cp = of_get_property(dn, "compatible", NULL);
@@
-1370,7
+1370,7
@@
static int vio_hotplug(struct device *dev, struct kobj_uevent_env *env)
struct device_node *dn;
const char *cp;
struct device_node *dn;
const char *cp;
- dn = dev->
archdata.
of_node;
+ dn = dev->of_node;
if (!dn)
return -ENODEV;
cp = of_get_property(dn, "compatible", NULL);
if (!dn)
return -ENODEV;
cp = of_get_property(dn, "compatible", NULL);
@@
-1402,7
+1402,7
@@
static struct bus_type vio_bus_type = {
*/
const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length)
{
*/
const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length)
{
- return of_get_property(vdev->dev.
archdata.
of_node, which, length);
+ return of_get_property(vdev->dev.of_node, which, length);
}
EXPORT_SYMBOL(vio_get_attribute);
}
EXPORT_SYMBOL(vio_get_attribute);