[PATCH 1/3] fixup! Rename device_d::device_node to device_d::of_node

[PATCH 1/3] fixup! Rename device_d::device_node to device_d::of_node

[Ahmad Fatoum]

  - Out-of-tree patches often add a board driver, which may use the
    old device_d/driver_d naming. Especially with bisecting, this can
    be a hassle

  - We may split up some parts of struct device into a new
    struct platform_device like Linux does and we don't want
    to break out of tree patches twice.

Thus add the old names as aliases for now.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/driver.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/driver.h b/include/driver.h
index 693d5cb3e580..c789f3151e70 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -74,7 +74,10 @@ struct device {
 	struct list_head cdevs;
 
 	const struct platform_device_id *id_entry;
-	struct device_node *of_node;
+	union {
+		struct device_node *device_node;
+		struct device_node *of_node;
+	};
 
 	const struct of_device_id *of_id_entry;
 
-- 
2.30.2

[PATCH 2/3] fixup! Rename struct device_d to device

[Ahmad Fatoum]

  - Out-of-tree patches often add a board driver, which may use the
    old device_d/driver_d naming. Especially with bisecting, this can
    be a hassle

  - We may split up some parts of struct device into a new
    struct platform_device like Linux does and we don't want
    to break out of tree patches twice.

Thus add the old names as aliases for now.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/driver.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/driver.h b/include/driver.h
index c789f3151e70..dfe1878163ac 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -121,6 +121,9 @@ struct driver {
 
 /*@}*/	/* do not delete, doxygen relevant */
 
+/* Legacy naming for out-of-tree patches. Will be phased out in future. */
+#define device_d device
+
 #define RW_SIZE(x)      (x)
 #define RW_SIZE_MASK    0x7
 
-- 
2.30.2

[PATCH 3/3] fixup! Rename struct driver_d to driver

[Ahmad Fatoum]

  - Out-of-tree patches often add a board driver, which may use the
    old device_d/driver_d naming. Especially with bisecting, this can
    be a hassle

  - We may split up some parts of struct device into a new
    struct platform_device like Linux does and we don't want
    to break out of tree patches twice.

Thus add the old names as aliases for now.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/driver.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/driver.h b/include/driver.h
index dfe1878163ac..2a12952215de 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -123,6 +123,7 @@ struct driver {
 
 /* Legacy naming for out-of-tree patches. Will be phased out in future. */
 #define device_d device
+#define driver_d driver
 
 #define RW_SIZE(x)      (x)
 #define RW_SIZE_MASK    0x7
-- 
2.30.2

Re: [PATCH 1/3] fixup! Rename device_d::device_node to device_d::of_node

[Sascha Hauer]

On Mon, Jan 09, 2023 at 12:09:19PM +0100, Ahmad Fatoum wrote:
>   - Out-of-tree patches often add a board driver, which may use the
>     old device_d/driver_d naming. Especially with bisecting, this can
>     be a hassle
> 
>   - We may split up some parts of struct device into a new
>     struct platform_device like Linux does and we don't want
>     to break out of tree patches twice.
> 
> Thus add the old names as aliases for now.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  include/driver.h | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/include/driver.h b/include/driver.h
> index 693d5cb3e580..c789f3151e70 100644
> --- a/include/driver.h
> +++ b/include/driver.h
> @@ -74,7 +74,10 @@ struct device {
>  	struct list_head cdevs;
>  
>  	const struct platform_device_id *id_entry;
> -	struct device_node *of_node;
> +	union {
> +		struct device_node *device_node;
> +		struct device_node *of_node;
> +	};
>  
>  	const struct of_device_id *of_id_entry;
>  
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |