mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
of: Always use 'struct device.of_node' to get device node pointer.
The following structure elements duplicate the information in 'struct device.of_node' and so are being eliminated. This patch makes all readers of these elements use device.of_node instead. (struct of_device *)->node (struct dev_archdata *)->prom_node (sparc) (struct dev_archdata *)->of_node (powerpc & microblaze) Signed-off-by: Grant Likely <[email protected]>
This commit is contained in:
parent
d12d42f744
commit
61c7a080a5
157 changed files with 497 additions and 488 deletions
|
|
@ -1139,7 +1139,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;
|
||||
|
||||
|
|
|
|||
|
|
@ -694,7 +694,7 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
|
|||
struct bcom_task *dmatsk = NULL;
|
||||
|
||||
/* Get ipb frequency */
|
||||
ipb_freq = mpc5xxx_get_bus_frequency(op->node);
|
||||
ipb_freq = mpc5xxx_get_bus_frequency(op->dev.of_node);
|
||||
if (!ipb_freq) {
|
||||
dev_err(&op->dev, "could not determine IPB bus frequency\n");
|
||||
return -ENODEV;
|
||||
|
|
@ -702,7 +702,7 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
|
|||
|
||||
/* Get device base address from device tree, request the region
|
||||
* and ioremap it. */
|
||||
rv = of_address_to_resource(op->node, 0, &res_mem);
|
||||
rv = of_address_to_resource(op->dev.of_node, 0, &res_mem);
|
||||
if (rv) {
|
||||
dev_err(&op->dev, "could not determine device base address\n");
|
||||
return rv;
|
||||
|
|
@ -735,14 +735,14 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
|
|||
* The MPC5200 ATA controller supports MWDMA modes 0, 1 and 2 and
|
||||
* UDMA modes 0, 1 and 2.
|
||||
*/
|
||||
prop = of_get_property(op->node, "mwdma-mode", &proplen);
|
||||
prop = of_get_property(op->dev.of_node, "mwdma-mode", &proplen);
|
||||
if ((prop) && (proplen >= 4))
|
||||
mwdma_mask = ATA_MWDMA2 & ((1 << (*prop + 1)) - 1);
|
||||
prop = of_get_property(op->node, "udma-mode", &proplen);
|
||||
prop = of_get_property(op->dev.of_node, "udma-mode", &proplen);
|
||||
if ((prop) && (proplen >= 4))
|
||||
udma_mask = ATA_UDMA2 & ((1 << (*prop + 1)) - 1);
|
||||
|
||||
ata_irq = irq_of_parse_and_map(op->node, 0);
|
||||
ata_irq = irq_of_parse_and_map(op->dev.of_node, 0);
|
||||
if (ata_irq == NO_IRQ) {
|
||||
dev_err(&op->dev, "error mapping irq\n");
|
||||
return -EINVAL;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1313,7 +1313,7 @@ static int sata_fsl_probe(struct of_device *ofdev,
|
|||
dev_printk(KERN_INFO, &ofdev->dev,
|
||||
"Sata FSL Platform/CSB Driver init\n");
|
||||
|
||||
hcr_base = of_iomap(ofdev->node, 0);
|
||||
hcr_base = of_iomap(ofdev->dev.of_node, 0);
|
||||
if (!hcr_base)
|
||||
goto error_exit_with_cleanup;
|
||||
|
||||
|
|
@ -1332,7 +1332,7 @@ static int sata_fsl_probe(struct of_device *ofdev,
|
|||
host_priv->ssr_base = ssr_base;
|
||||
host_priv->csr_base = csr_base;
|
||||
|
||||
irq = irq_of_parse_and_map(ofdev->node, 0);
|
||||
irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
|
||||
if (irq < 0) {
|
||||
dev_printk(KERN_ERR, &ofdev->dev, "invalid irq from platform\n");
|
||||
goto error_exit_with_cleanup;
|
||||
|
|
|
|||
Loading…
Reference in a new issue