[PATCH 21/37] drivers/ata: use .dev.of_node instead of .node in struct of_device

2010-03-11 Thread Grant Likely 
.node is being removed

Signed-off-by: Grant Likely grant.lik...@secretlab.ca
---

 drivers/ata/pata_macio.c   |2 +-
 drivers/ata/pata_of_platform.c |2 +-
 drivers/ide/pmac.c |   10 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 4cc7bbd..2cf31e7 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -1138,7 +1138,7 @@ static int __devinit pata_macio_attach(struct macio_dev 
*mdev,
Failed to allocate private memory\n);
return -ENOMEM;
}
-   priv-node = of_node_get(mdev-ofdev.node);
+   priv-node = of_node_get(mdev-ofdev.dev.of_node);
priv-mdev = mdev;
priv-dev = mdev-ofdev.dev;
 
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index 1f18ad9..19da29f 100644
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -18,7 +18,7 @@ static int __devinit pata_of_platform_probe(struct of_device 
*ofdev,
const struct of_device_id *match)
 {
int ret;
-   struct device_node *dn = ofdev-node;
+   struct device_node *dn = ofdev-dev.of_node;
struct resource io_res;
struct resource ctl_res;
struct resource irq_res;
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index 850ee45..9697de9 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -1152,7 +1152,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const 
struct of_device_id *match)
 
if (macio_resource_count(mdev) == 0) {
printk(KERN_WARNING ide-pmac: no address for %s\n,
-   mdev-ofdev.node-full_name);
+   mdev-ofdev.dev.of_node-full_name);
rc = -ENXIO;
goto out_free_pmif;
}
@@ -1160,7 +1160,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const 
struct of_device_id *match)
/* Request memory resource for IO ports */
if (macio_request_resource(mdev, 0, ide-pmac (ports))) {
printk(KERN_ERR ide-pmac: can't request MMIO resource for 
-   %s!\n, mdev-ofdev.node-full_name);
+   %s!\n, mdev-ofdev.dev.of_node-full_name);
rc = -EBUSY;
goto out_free_pmif;
}
@@ -1172,7 +1172,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const 
struct of_device_id *match)
 */
if (macio_irq_count(mdev) == 0) {
printk(KERN_WARNING ide-pmac: no intrs for device %s, using 
-   13\n, mdev-ofdev.node-full_name);
+   13\n, mdev-ofdev.dev.of_node-full_name);
irq = irq_create_mapping(NULL, 13);
} else
irq = macio_irq(mdev, 0);
@@ -1181,7 +1181,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const 
struct of_device_id *match)
regbase = (unsigned long) base;
 
pmif-mdev = mdev;
-   pmif-node = mdev-ofdev.node;
+   pmif-node = mdev-ofdev.dev.of_node;
pmif-regbase = regbase;
pmif-irq = irq;
pmif-kauai_fcr = NULL;
@@ -1190,7 +1190,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const 
struct of_device_id *match)
if (macio_request_resource(mdev, 1, ide-pmac (dma)))
printk(KERN_WARNING ide-pmac: can't request DMA 
resource for %s!\n,
-   mdev-ofdev.node-full_name);
+   mdev-ofdev.dev.of_node-full_name);
else
pmif-dma_regs = ioremap(macio_resource_start(mdev, 1), 
0x1000);
} else

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 21/37] drivers/ata: use .dev.of_node instead of .node in struct of_device

2010-03-11 Thread Jeff Garzik 

On 03/11/2010 01:31 PM, Sergei Shtylyov wrote:

Hello.

Grant Likely wrote:


.node is being removed

Signed-off-by: Grant Likely grant.lik...@secretlab.ca
---

drivers/ata/pata_macio.c | 2 +-
drivers/ata/pata_of_platform.c | 2 +-
drivers/ide/pmac.c | 10 +-
3 files changed, 7 insertions(+), 7 deletions(-)


Should probably have been 2 patches instead of one, as drivers/ata/ and
drivers/ide/ are different subsystems...


Possibly, but these patches should go in via the OF tree anyway, so 
collecting ACKs should be sufficient.


Jeff



___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 21/37] drivers/ata: use .dev.of_node instead of .node in struct of_device

2010-03-11 Thread David Miller 
From: Sergei Shtylyov sshtyl...@mvista.com
Date: Thu, 11 Mar 2010 21:31:14 +0300

   Should probably have been 2 patches instead of one, as drivers/ata/
   and drivers/ide/ are different subsystems...

No, he should consolidate these changes _MORE_ not less.

The patch set is already too large to review at it is!
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 21/37] drivers/ata: use .dev.of_node instead of .node in struct of_device

2010-03-11 Thread Sergei Shtylyov 

Hello.

Grant Likely wrote:


.node is being removed

Signed-off-by: Grant Likely grant.lik...@secretlab.ca
---

 drivers/ata/pata_macio.c   |2 +-
 drivers/ata/pata_of_platform.c |2 +-
 drivers/ide/pmac.c |   10 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
  


  Should probably have been 2 patches instead of one, as drivers/ata/ 
and drivers/ide/ are different subsystems...


MBR, Sergei

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev