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

Commit 5d10302f authored by Grant Likely's avatar Grant Likely
Browse files

dt: remove extra xsysace platform_driver registration 



After commit 1c48a5c9, "dt: Eliminate
of_platform_{,un}register_driver", the xsysace driver attempts to
register two platform_drivers with the same name, which a) doesn't
work, and b) isn't necessary.  This patch merges the two
platform_drivers.

Reported-by: default avatarDaniel Hellstrom <daniel@gaisler.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 2e39e5be

drivers/block/xsysace.c

+16 −82
Original line number Diff line number Diff line
@@ -1155,12 +1155,19 @@ static int __devinit ace_probe(struct platform_device *dev) 
{

	resource_size_t physaddr = 0;

	int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */

	int id = dev->id;

	u32 id = dev->id;

	int irq = NO_IRQ;

	int i;



	dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);



	/* device id and bus width */

	of_property_read_u32(dev->dev.of_node, "port-number", &id);

	if (id < 0)

		id = 0;

	if (of_find_property(dev->dev.of_node, "8-bit", NULL))

		bus_width = ACE_BUS_WIDTH_8;



	for (i = 0; i < dev->num_resources; i++) {

		if (dev->resource[i].flags & IORESOURCE_MEM)

			physaddr = dev->resource[i].start;
@@ -1181,57 +1188,7 @@ static int __devexit ace_remove(struct platform_device *dev) 
	return 0;

}



static struct platform_driver ace_platform_driver = {

	.probe = ace_probe,

	.remove = __devexit_p(ace_remove),

	.driver = {

		.owner = THIS_MODULE,

		.name = "xsysace",

	},

};



/* ---------------------------------------------------------------------

 * OF_Platform Bus Support

 */



#if defined(CONFIG_OF)

static int __devinit ace_of_probe(struct platform_device *op)

{

	struct resource res;

	resource_size_t physaddr;

	const u32 *id;

	int irq, bus_width, rc;



	/* device id */

	id = of_get_property(op->dev.of_node, "port-number", NULL);



	/* physaddr */

	rc = of_address_to_resource(op->dev.of_node, 0, &res);

	if (rc) {

		dev_err(&op->dev, "invalid address\n");

		return rc;

	}

	physaddr = res.start;



	/* irq */

	irq = irq_of_parse_and_map(op->dev.of_node, 0);



	/* bus width */

	bus_width = ACE_BUS_WIDTH_16;

	if (of_find_property(op->dev.of_node, "8-bit", NULL))

		bus_width = ACE_BUS_WIDTH_8;



	/* Call the bus-independent setup code */

	return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0,

						physaddr, irq, bus_width);

}



static int __devexit ace_of_remove(struct platform_device *op)

{

	ace_free(&op->dev);

	return 0;

}



/* Match table for of_platform binding */

static const struct of_device_id ace_of_match[] __devinitconst = {

	{ .compatible = "xlnx,opb-sysace-1.00.b", },
@@ -1241,34 +1198,20 @@ static const struct of_device_id ace_of_match[] __devinitconst = { 
	{},

};

MODULE_DEVICE_TABLE(of, ace_of_match);

#else /* CONFIG_OF */

#define ace_of_match NULL

#endif /* CONFIG_OF */



static struct platform_driver ace_of_driver = {

	.probe = ace_of_probe,

	.remove = __devexit_p(ace_of_remove),

static struct platform_driver ace_platform_driver = {

	.probe = ace_probe,

	.remove = __devexit_p(ace_remove),

	.driver = {

		.name = "xsysace",

		.owner = THIS_MODULE,

		.name = "xsysace",

		.of_match_table = ace_of_match,

	},

};



/* Registration helpers to keep the number of #ifdefs to a minimum */

static inline int __init ace_of_register(void)

{

	pr_debug("xsysace: registering OF binding\n");

	return platform_driver_register(&ace_of_driver);

}



static inline void __exit ace_of_unregister(void)

{

	platform_driver_unregister(&ace_of_driver);

}

#else /* CONFIG_OF */

/* CONFIG_OF not enabled; do nothing helpers */

static inline int __init ace_of_register(void) { return 0; }

static inline void __exit ace_of_unregister(void) { }

#endif /* CONFIG_OF */



/* ---------------------------------------------------------------------

 * Module init/exit routines

 */
@@ -1282,11 +1225,6 @@ static int __init ace_init(void) 
		goto err_blk;

	}



	rc = ace_of_register();

	if (rc)

		goto err_of;



	pr_debug("xsysace: registering platform binding\n");

	rc = platform_driver_register(&ace_platform_driver);

	if (rc)

		goto err_plat;
@@ -1295,21 +1233,17 @@ static int __init ace_init(void) 
	return 0;



err_plat:

	ace_of_unregister();

err_of:

	unregister_blkdev(ace_major, "xsysace");

err_blk:

	printk(KERN_ERR "xsysace: registration failed; err=%i\n", rc);

	return rc;

}

module_init(ace_init);



static void __exit ace_exit(void)

{

	pr_debug("Unregistering Xilinx SystemACE driver\n");

	platform_driver_unregister(&ace_platform_driver);

	ace_of_unregister();

	unregister_blkdev(ace_major, "xsysace");

}



module_init(ace_init);

module_exit(ace_exit);