[04/17] auxdisplay: img-ascii-lcd: Add helper variable dev

Commit Message

Geert Uytterhoeven March 22, 2021, 2:48 p.m. UTC

img_ascii_lcd_probe() has many users of "pdev->dev".  Add a shorthand to
simplify the code.

Signed-off-by: Geert Uytterhoeven <[e-mail]>
---
 drivers/auxdisplay/img-ascii-lcd.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Comments

Miguel Ojeda March 22, 2021, 4:59 p.m. UTC | #1

On Mon, Mar 22, 2021 at 3:48 PM Geert Uytterhoeven <[e-mail]> wrote:
>
> +       struct device *dev = &pdev->dev;

Do we want helpers like this to be `*const` (assuming they can)? (same
for patch 12).

Cheers,
Miguel

Geert Uytterhoeven March 22, 2021, 5:53 p.m. UTC | #2

Hi Miguel,

On Mon, Mar 22, 2021 at 5:59 PM Miguel Ojeda
<[e-mail]> wrote:
> On Mon, Mar 22, 2021 at 3:48 PM Geert Uytterhoeven <[e-mail]> wrote:
> > +       struct device *dev = &pdev->dev;
>
> Do we want helpers like this to be `*const` (assuming they can)? (same
> for patch 12).

No, e.g. the devm_*() functions need to make changes to the device's
structure.

Gr{oetje,eeting}s,

                        Geert

Patch

diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c
index e33ce0151cdfd150..2b6e41ec57544faa 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;