From e70b9d7a74698f1374244b2251216428db920aed Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 14 Dec 2022 13:35:08 +0100 Subject: Rename device_d::device_node to device_d::of_node Linux struct device has the member of_node for the device_node pointer. Rename this in barebox accordingly to minimize the necessary changes when porting Linux code. This was done with the semantic patch: @@ struct device_d E; @@ - E.device_node + E.of_node @@ struct device_d *E; @@ - E->device_node + E->of_node Plus some manual adjustments. Signed-off-by: Sascha Hauer Reviewed-by: Marco Felsch Link: https://lore.barebox.org/20221214123512.189688-2-s.hauer@pengutronix.de Signed-off-by: Sascha Hauer --- drivers/input/matrix-keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/input/matrix-keymap.c') diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c index 68dc5d2f06..1d974f7f7a 100644 --- a/drivers/input/matrix-keymap.c +++ b/drivers/input/matrix-keymap.c @@ -9,7 +9,7 @@ static int matrix_keypad_parse_of_keymap(struct device_d *dev, { unsigned int proplen, i, size; const __be32 *prop; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const char *propname = "linux,keymap"; prop = of_get_property(np, propname, &proplen); @@ -61,7 +61,7 @@ int matrix_keypad_build_keymap(struct device_d *dev, const struct matrix_keymap_ { int i; - if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node) + if (IS_ENABLED(CONFIG_OFDEVICE) && dev->of_node) return matrix_keypad_parse_of_keymap(dev, row_shift, keymap); if (!keymap_data) -- cgit v1.2.3