Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'auxdisplay-6.8' of https://github.com/ojeda/linux
Pull auxdisplay update from Miguel Ojeda:
"A single cleanup for 'img-ascii-lcd' to use 'device_get_match_data()'"
* tag 'auxdisplay-6.8' of https://github.com/ojeda/linux:
auxdisplay: img-ascii-lcd: Use device_get_match_data()
+3
-9
+3
-9
drivers/auxdisplay/img-ascii-lcd.c
+3
-9
drivers/auxdisplay/img-ascii-lcd.c
···
8
8
#include <linux/io.h>
9
9
#include <linux/mfd/syscon.h>
10
10
#include <linux/module.h>
11
-
#include <linux/of_address.h>
12
-
#include <linux/of_platform.h>
11
+
#include <linux/of.h>
13
12
#include <linux/platform_device.h>
13
+
#include <linux/property.h>
14
14
#include <linux/regmap.h>
15
15
#include <linux/slab.h>
16
16
···
225
225
*/
226
226
static int img_ascii_lcd_probe(struct platform_device *pdev)
227
227
{
228
-
const struct of_device_id *match;
229
-
const struct img_ascii_lcd_config *cfg;
230
228
struct device *dev = &pdev->dev;
229
+
const struct img_ascii_lcd_config *cfg = device_get_match_data(dev);
231
230
struct img_ascii_lcd_ctx *ctx;
232
231
int err;
233
232
234
-
match = of_match_device(img_ascii_lcd_matches, dev);
235
-
if (!match)
236
-
return -ENODEV;
237
-
238
-
cfg = match->data;
239
233
ctx = devm_kzalloc(dev, sizeof(*ctx) + cfg->num_chars, GFP_KERNEL);
240
234
if (!ctx)
241
235
return -ENOMEM;