Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd4cd730 authored by Grant Likely's avatar Grant Likely
Browse files

sparc: remove references to of_device and to_of_device 



of_device is just a #define alias to platform_device.  This patch
replaces all references to it with platform_device.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a454dc50

arch/sparc/include/asm/prom.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long s 


/* These routines are here to provide compatibility with how powerpc

 * handles IRQ mapping for OF device nodes.  We precompute and permanently

 * register them in the of_device objects, whereas powerpc computes them

 * register them in the platform_device objects, whereas powerpc computes them

 * on request.

 */

static inline void irq_dispose_mapping(unsigned int virq)

arch/sparc/kernel/apc.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void apc_swift_idle(void) 
#endif

} 



static inline void apc_free(struct of_device *op)

static inline void apc_free(struct platform_device *op)

{

	of_iounmap(&op->resource[0], regs, resource_size(&op->resource[0]));

}
@@ -136,7 +136,7 @@ static const struct file_operations apc_fops = { 


static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops };



static int __devinit apc_probe(struct of_device *op,

static int __devinit apc_probe(struct platform_device *op,

			       const struct of_device_id *match)

{

	int err;

arch/sparc/kernel/auxio_64.c

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ static struct of_device_id __initdata auxio_match[] = { 


MODULE_DEVICE_TABLE(of, auxio_match);



static int __devinit auxio_probe(struct of_device *dev, const struct of_device_id *match)

static int __devinit auxio_probe(struct platform_device *dev,

				 const struct of_device_id *match)

{

	struct device_node *dp = dev->dev.of_node;

	unsigned long size;

arch/sparc/kernel/central.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int __devinit clock_board_calc_nslots(struct clock_board *p) 
	}

}



static int __devinit clock_board_probe(struct of_device *op,

static int __devinit clock_board_probe(struct platform_device *op,

				       const struct of_device_id *match)

{

	struct clock_board *p = kzalloc(sizeof(*p), GFP_KERNEL);
@@ -157,7 +157,7 @@ static struct of_platform_driver clock_board_driver = { 
	},

};



static int __devinit fhc_probe(struct of_device *op,

static int __devinit fhc_probe(struct platform_device *op,

			       const struct of_device_id *match)

{

	struct fhc *p = kzalloc(sizeof(*p), GFP_KERNEL);

arch/sparc/kernel/chmc.c

+6 −6
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void __devinit jbusmc_construct_dimm_groups(struct jbusmc *p, 
	}

}



static int __devinit jbusmc_probe(struct of_device *op,

static int __devinit jbusmc_probe(struct platform_device *op,

				  const struct of_device_id *match)

{

	const struct linux_prom64_registers *mem_regs;
@@ -690,7 +690,7 @@ static void chmc_fetch_decode_regs(struct chmc *p) 
				      chmc_read_mcreg(p, CHMCTRL_DECODE4));

}



static int __devinit chmc_probe(struct of_device *op,

static int __devinit chmc_probe(struct platform_device *op,

				const struct of_device_id *match)

{

	struct device_node *dp = op->dev.of_node;
@@ -765,7 +765,7 @@ static int __devinit chmc_probe(struct of_device *op, 
	goto out;

}



static int __devinit us3mc_probe(struct of_device *op,

static int __devinit us3mc_probe(struct platform_device *op,

				const struct of_device_id *match)

{

	if (mc_type == MC_TYPE_SAFARI)
@@ -775,21 +775,21 @@ static int __devinit us3mc_probe(struct of_device *op, 
	return -ENODEV;

}



static void __devexit chmc_destroy(struct of_device *op, struct chmc *p)

static void __devexit chmc_destroy(struct platform_device *op, struct chmc *p)

{

	list_del(&p->list);

	of_iounmap(&op->resource[0], p->regs, 0x48);

	kfree(p);

}



static void __devexit jbusmc_destroy(struct of_device *op, struct jbusmc *p)

static void __devexit jbusmc_destroy(struct platform_device *op, struct jbusmc *p)

{

	mc_list_del(&p->list);

	of_iounmap(&op->resource[0], p->regs, JBUSMC_REGS_SIZE);

	kfree(p);

}



static int __devexit us3mc_remove(struct of_device *op)

static int __devexit us3mc_remove(struct platform_device *op)

{

	void *p = dev_get_drvdata(&op->dev);