auxdisplay: img-ascii-lcd: 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>
Cc: Paul Burton <paulburton@kernel.org>
Link: https://lore.kernel.org/r/20231115210245.3744589-1-robh@kernel.org
[ As discussed, used `dev` and moved call to `cfg`'s initialization. ]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c
index fa23e415f260ec5659be0c15f2f9bdef03903288..56efda0740fbc122eaf6e6b94406662480d50930 100644 (file)
--- a/drivers/auxdisplay/img-ascii-lcd.c
+++ b/drivers/auxdisplay/img-ascii-lcd.c
@@ -8,9 +8,9 @@
 #include <linux/io.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
 
@@ -225,17 +225,11 @@ MODULE_DEVICE_TABLE(of, img_ascii_lcd_matches);
  */
 static int img_ascii_lcd_probe(struct platform_device *pdev)
 {
-       const struct of_device_id *match;
-       const struct img_ascii_lcd_config *cfg;
        struct device *dev = &pdev->dev;
+       const struct img_ascii_lcd_config *cfg = device_get_match_data(dev);
        struct img_ascii_lcd_ctx *ctx;
        int err;
 
-       match = of_match_device(img_ascii_lcd_matches, dev);
-       if (!match)
-               return -ENODEV;
-
-       cfg = match->data;
        ctx = devm_kzalloc(dev, sizeof(*ctx) + cfg->num_chars, GFP_KERNEL);
        if (!ctx)
                return -ENOMEM;