diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-10-19 16:45:03 +0200 |
|---|---|---|
| committer | Miguel Ojeda <ojeda@kernel.org> | 2021-10-21 23:36:28 +0200 |
| commit | 7b88e5530f4d9d636b33d776b753a52169cc5b42 (patch) | |
| tree | 747963c0c2b20a6882d70c67e4b08708fd4f0c30 /drivers/auxdisplay | |
| parent | auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string (diff) | |
| download | linux-7b88e5530f4d9d636b33d776b753a52169cc5b42.tar.xz linux-7b88e5530f4d9d636b33d776b753a52169cc5b42.zip | |
auxdisplay: img-ascii-lcd: Add helper variable dev
img_ascii_lcd_probe() has many users of "pdev->dev". Add a shorthand to
simplify the code.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Diffstat (limited to 'drivers/auxdisplay')
| -rw-r--r-- | drivers/auxdisplay/img-ascii-lcd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c index e33ce0151cdf..2b6e41ec5754 100644 --- a/drivers/auxdisplay/img-ascii-lcd.c +++ b/drivers/auxdisplay/img-ascii-lcd.c @@ -365,26 +365,25 @@ 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; struct img_ascii_lcd_ctx *ctx; int err; - match = of_match_device(img_ascii_lcd_matches, &pdev->dev); + match = of_match_device(img_ascii_lcd_matches, dev); if (!match) return -ENODEV; cfg = match->data; - ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx) + cfg->num_chars, - GFP_KERNEL); + ctx = devm_kzalloc(dev, sizeof(*ctx) + cfg->num_chars, GFP_KERNEL); if (!ctx) return -ENOMEM; if (cfg->external_regmap) { - ctx->regmap = syscon_node_to_regmap(pdev->dev.parent->of_node); + ctx->regmap = syscon_node_to_regmap(dev->parent->of_node); if (IS_ERR(ctx->regmap)) return PTR_ERR(ctx->regmap); - if (of_property_read_u32(pdev->dev.of_node, "offset", - &ctx->offset)) + if (of_property_read_u32(dev->of_node, "offset", &ctx->offset)) return -EINVAL; } else { ctx->base = devm_platform_ioremap_resource(pdev, 0); @@ -408,7 +407,7 @@ static int img_ascii_lcd_probe(struct platform_device *pdev) if (err) goto out_del_timer; - err = device_create_file(&pdev->dev, &dev_attr_message); + err = device_create_file(dev, &dev_attr_message); if (err) goto out_del_timer; |