diff options
| author | Rob Herring <robh@kernel.org> | 2023-11-15 15:02:44 -0600 |
|---|---|---|
| committer | Miguel Ojeda <ojeda@kernel.org> | 2023-12-01 16:39:45 +0100 |
| commit | c52391fafcefe4c562bdac62088a2735c185b942 (patch) | |
| tree | 59a1f2a97e67831956946fa267ab8cce5e0bdfa7 | |
| parent | 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab (diff) | |
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>
| -rw-r--r-- | drivers/auxdisplay/img-ascii-lcd.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c index fa23e415f260..56efda0740fb 100644 --- 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; |