Input: tegra-kbc - 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 <robh@kernel.org>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20231006224432.442709-1-robh@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index c9a823ea45d02965275f44318a7e8c5af3790887..a1765ed8c825c16298d5ca7e523c049504fcf3fa 100644 (file)
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -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 +