Skip to contentSkip to conversation

Input: tegra: Use device_get_match_data()

PATCH Applied Rob Herring 3 participants 3 messages Oct 6, 2023 – Oct 14, 2023

Subsystems (4)
HID Tegra architecture support Input drivers Tegra kbc driver
lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/1 Input: tegra: Use device_get_match_data()

Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers.

Signed-off-by Rob Herring <[email protected]>
---
 drivers/input/keyboard/tegra-kbc.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/input/keyboard/tegra-kbc.c +2 -5
index c9a823ea45d0..a1765ed8c825 100644
@@ -14,7 +14,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
+#include <linux/property.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
 #include <linux/input/matrix_keypad.h>

@@ -602,9 +602,6 @@ static int tegra_kbc_probe(struct platform_device *pdev)
 	unsigned int debounce_cnt;
 	unsigned int scan_time_rows;
 	unsigned int keymap_rows;
-	const struct of_device_id *match;
-
-	match = of_match_device(tegra_kbc_of_match, &pdev->dev);
 
 	kbc = devm_kzalloc(&pdev->dev, sizeof(*kbc), GFP_KERNEL);
 	if (!kbc) {

@@ -613,7 +610,7 @@ static int tegra_kbc_probe(struct platform_device *pdev)
 	}
 
 	kbc->dev = &pdev->dev;
-	kbc->hw_support = match->data;
+	kbc->hw_support = device_get_match_data(&pdev->dev);
 	kbc->max_keys = kbc->hw_support->max_rows *
 				kbc->hw_support->max_columns;
 	kbc->num_rows_and_columns = kbc->hw_support->max_rows +
Signature · 1 line
2.40.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Rob Herring

Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers.

Signed-off-by Rob Herring <[email protected]>
---
 drivers/input/keyboard/tegra-kbc.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Acked-by Thierry Reding <[email protected]>