Sysace: Use the established platform bus api (edec4961) · Commits · 戴 / test

drivers/block/xsysace.c

+30 −18

Original line number	Diff line number	Diff line
		@@ -1060,13 +1060,12 @@ static void __devexit ace_teardown(struct ace_device *ace)
		* Platform Bus Support
		*/

		static int __devinit ace_probe(struct device *device)
		static int __devinit ace_probe(struct platform_device *dev)
		{
		struct platform_device *dev = to_platform_device(device);
		struct ace_device *ace;
		int i;

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

		/*
		* Allocate the ace device structure
		@@ -1075,7 +1074,7 @@ static int __devinit ace_probe(struct device *device)
		if (!ace)
		goto err_alloc;

		ace->dev = device;
		ace->dev = &dev->dev;
		ace->id = dev->id;
		ace->irq = NO_IRQ;

		@@ -1089,7 +1088,7 @@ static int __devinit ace_probe(struct device *device)
		/* FIXME: Should get bus_width from the platform_device struct */
		ace->bus_width = 1;

		dev_set_drvdata(&dev->dev, ace);
		platform_set_drvdata(dev, ace);

		/* Call the bus-independant setup code */
		if (ace_setup(ace) != 0)
		@@ -1098,7 +1097,7 @@ static int __devinit ace_probe(struct device *device)
		return 0;

		err_setup:
		dev_set_drvdata(&dev->dev, NULL);
		platform_set_drvdata(dev, NULL);
		kfree(ace);
		err_alloc:
		printk(KERN_ERR "xsysace: could not initialize device\n");
		@@ -1108,25 +1107,27 @@ static int __devinit ace_probe(struct device *device)
		/*
		* Platform bus remove() method
		*/
		static int __devexit ace_remove(struct device *device)
		static int __devexit ace_remove(struct platform_device *dev)
		{
		struct ace_device *ace = dev_get_drvdata(device);

		dev_dbg(device, "ace_remove(%p)\n", device);
		struct ace_device *ace = platform_get_drvdata(dev);
		dev_dbg(&dev->dev, "ace_remove(%p)\n", dev);

		if (ace) {
		ace_teardown(ace);
		platform_set_drvdata(dev, NULL);
		kfree(ace);
		}

		return 0;
		}

		static struct device_driver ace_driver = {
		.name = "xsysace",
		.bus = &platform_bus_type,
		static struct platform_driver ace_platform_driver = {
		.probe = ace_probe,
		.remove = __devexit_p(ace_remove),
		.driver = {
		.owner = THIS_MODULE,
		.name = "xsysace",
		},
		};

		/* ---------------------------------------------------------------------
		@@ -1134,20 +1135,31 @@ static struct device_driver ace_driver = {
		*/
		static int __init ace_init(void)
		{
		int rc;

		ace_major = register_blkdev(ace_major, "xsysace");
		if (ace_major <= 0) {
		printk(KERN_WARNING "xsysace: register_blkdev() failed\n");
		return ace_major;
		rc = -ENOMEM;
		goto err_blk;
		}

		pr_debug("Registering Xilinx SystemACE driver, major=%i\n", ace_major);
		return driver_register(&ace_driver);
		if ((rc = platform_driver_register(&ace_platform_driver)) != 0)
		goto err_plat;

		pr_info("Xilinx SystemACE device driver, major=%i\n", ace_major);
		return 0;

		err_plat:
		unregister_blkdev(ace_major, "xsysace");
		err_blk:
		printk(KERN_ERR "xsysace: registration failed; err=%i\n", rc);
		return rc;
		}

		static void __exit ace_exit(void)
		{
		pr_debug("Unregistering Xilinx SystemACE driver\n");
		driver_unregister(&ace_driver);
		platform_driver_unregister(&ace_platform_driver);
		unregister_blkdev(ace_major, "xsysace");
		}

Admin message