RE: [RFC PATCH 06/15] dt: xilinx_hwicap: merge platform and of_platformdriver bindings

Minor nit below

Acked-by: Stephen Neuendorffer <redacted>

Steve

-----Original Message-----
From: linuxppc-dev-bounces+stephen=3Dneuendorffer.name@lists.ozlabs.org

[mailto:linuxppc-dev-

bounces+stephen=3Dneuendorffer.name@lists.ozlabs.org] On Behalf Of Grant

Likely

Sent: Tuesday, February 22, 2011 8:34 PM
To: Benjamin Herrenschmidt; devicetree-discuss@lists.ozlabs.org;

sfr@canb.auug.org.au; linux-

kernel@vger.kernel.org; davem@davemloft.net
Cc: sparclinux@vger.kernel.org; linuxppc-dev@lists.ozlabs.org
Subject: [RFC PATCH 06/15] dt: xilinx_hwicap: merge platform and

of_platformdriver bindings

=

of_platform_driver is getting removed, and a single platform_driver
can now support both devicetree and non-devicetree use cases.  This
patch merges the two driver registrations.
=

Signed-off-by: Grant Likely <redacted>
---
 drivers/char/xilinx_hwicap/xilinx_hwicap.c |  129

+++++++++++-----------------

 1 files changed, 49 insertions(+), 80 deletions(-)
=

b/drivers/char/xilinx_hwicap/xilinx_hwicap.c

*dev)

 	return 0;		/* success */
 }
=

-static int __devinit hwicap_drv_probe(struct platform_device *pdev)
+#ifdef CONFIG_OF
+static int __devinit hwicap_of_probe(struct platform_device *op)
 {
-	struct resource *res;
-	const struct config_registers *regs;
+	struct resource res;
+	const unsigned int *id;
 	const char *family;
+	int rc;
+	const struct hwicap_driver_config *config =3D

op->dev.of_match->data;

+	const struct config_registers *regs;
=

-	res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res)
-		return -ENODEV;
+
+	rc =3D of_address_to_resource(op->dev.of_node, 0, &res);
+	if (rc) {
+		dev_err(&op->dev, "invalid address\n");
+		return rc;
+	}
+
+	id =3D of_get_property(op->dev.of_node, "port-number", NULL);
=

 	/* It's most likely that we're using V4, if the family is not
 	   specified */
 	regs =3D &v4_config_registers;
-	family =3D pdev->dev.platform_data;
+	family =3D of_get_property(op->dev.of_node, "xlnx,family", NULL);
=

platform_device *pdev)

 			regs =3D &v5_config_registers;
 		}
 	}
-
-	return hwicap_setup(&pdev->dev, pdev->id, res,
-			&buffer_icap_config, regs);
+	return hwicap_setup(&op->dev, id ? *id : -1, &res, config,
+			regs);
 }
-
-static int __devexit hwicap_drv_remove(struct platform_device *pdev)
+#else
+static inline int hwicap_of_probe(struct platform_device *op)
 {
-	return hwicap_remove(&pdev->dev);
+	return -EINVAL;
 }
+#endif /* CONFIG_OF */
=

-static struct platform_driver hwicap_platform_driver =3D {
-	.probe =3D hwicap_drv_probe,
-	.remove =3D hwicap_drv_remove,
-	.driver =3D {
-		.owner =3D THIS_MODULE,
-		.name =3D DRIVER_NAME,
-	},
-};
-
-/*

---------------------------------------------------------------------

- * OF bus binding
- */
-
-#if defined(CONFIG_OF)
-static int __devinit
-hwicap_of_probe(struct platform_device *op, const struct of_device_id

*match)

+static int __devinit hwicap_drv_probe(struct platform_device *pdev)
 {
-	struct resource res;
-	const unsigned int *id;
-	const char *family;
-	int rc;
-	const struct hwicap_driver_config *config =3D match->data;
+	struct resource *res;
 	const struct config_registers *regs;
+	const char *family;
=

-	dev_dbg(&op->dev, "hwicap_of_probe(%p, %p)\n", op, match);
-
-	rc =3D of_address_to_resource(op->dev.of_node, 0, &res);
-	if (rc) {
-		dev_err(&op->dev, "invalid address\n");
-		return rc;
-	}
+	if (pdev->dev.of_match)
+		return hwicap_of_probe(pdev);
=

-	id =3D of_get_property(op->dev.of_node, "port-number", NULL);
+	res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res)
+		return -ENODEV;
=

 	/* It's most likely that we're using V4, if the family is not
 	   specified */
 	regs =3D &v4_config_registers;
-	family =3D of_get_property(op->dev.of_node, "xlnx,family", NULL);
+	family =3D pdev->dev.platform_data;
=

const struct of_device_id *match)

 			regs =3D &v5_config_registers;
 		}
 	}
-	return hwicap_setup(&op->dev, id ? *id : -1, &res, config,
-			regs);
+
+	return hwicap_setup(&pdev->dev, pdev->id, res,
+			&buffer_icap_config, regs);
 }
=

-static int __devexit hwicap_of_remove(struct platform_device *op)
+static int __devexit hwicap_drv_remove(struct platform_device *pdev)
 {
-	return hwicap_remove(&op->dev);
+	return hwicap_remove(&pdev->dev);
 }
=

+#ifdef CONFIG_OF
 /* Match table for of_platform binding */

Does the comment still make sense?

 static const struct of_device_id __devinitconst hwicap_of_match[] =3D {
 	{ .compatible =3D "xlnx,opb-hwicap-1.00.b", .data =3D

&buffer_icap_config},

hwicap_of_match[] =3D {

 	{},
 };
 MODULE_DEVICE_TABLE(of, hwicap_of_match);
+#else
+#define hwicap_of_match NULL
+#endif
=

-static struct of_platform_driver hwicap_of_driver =3D {
-	.probe =3D hwicap_of_probe,
-	.remove =3D __devexit_p(hwicap_of_remove),
+static struct platform_driver hwicap_platform_driver =3D {
+	.probe =3D hwicap_drv_probe,
+	.remove =3D hwicap_drv_remove,
 	.driver =3D {
-		.name =3D DRIVER_NAME,
 		.owner =3D THIS_MODULE,
+		.name =3D DRIVER_NAME,
 		.of_match_table =3D hwicap_of_match,
 	},
 };
=

-/* Registration helpers to keep the number of #ifdefs to a minimum */
-static inline int __init hwicap_of_register(void)
-{
-	pr_debug("hwicap: calling of_register_platform_driver()\n");
-	return of_register_platform_driver(&hwicap_of_driver);
-}
-
-static inline void __exit hwicap_of_unregister(void)
-{
-	of_unregister_platform_driver(&hwicap_of_driver);
-}
-#else /* CONFIG_OF */
-/* CONFIG_OF not enabled; do nothing helpers */
-static inline int __init hwicap_of_register(void) { return 0; }
-static inline void __exit hwicap_of_unregister(void) { }
-#endif /* CONFIG_OF */
+/*

---------------------------------------------------------------------

+ * OF bus binding
+ */
=

 	retval =3D platform_driver_register(&hwicap_platform_driver);
-
-	if (retval)
-		goto failed1;
-
-	retval =3D hwicap_of_register();
-
 	if (retval)
-		goto failed2;
+		goto failed;
=

 	return retval;
=

- failed2:
-	platform_driver_unregister(&hwicap_platform_driver);
-
- failed1:
+ failed:
 	unregister_chrdev_region(devt, HWICAP_DEVICES);
=

 	platform_driver_unregister(&hwicap_platform_driver);
=

-	hwicap_of_unregister();
-
 	unregister_chrdev_region(devt, HWICAP_DEVICES);
 }
=

=

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

This email and any attachments are intended for the sole use of the named r=
ecipient(s) and contain(s) confidential information that may be proprietary=
, privileged or copyrighted under applicable law. If you are not the intend=
ed recipient, do not read, copy, or forward this email message or any attac=
hments. Delete this email message and any attachments immediately.