Merge tag 'auxdisplay-for-linus-v5.6-rc6' of git://github.com/ojeda/linux (2a48b379) · Commits · 戴 / test

Pull auxdisplay updates from Miguel Ojeda: "A few minor auxdisplay improvements: - charlcd: replace zero-length array with flexible-array member (kernel-wide cleanup by Gustavo A. R. Silva) - img-ascii-lcd: convert to devm_platform_ioremap_resource (Yangtao Li) - Fix Kconfig indentation (Krzysztof Kozlowski) * tag 'auxdisplay-for-linus-v5.6-rc6' of git://github.com/ojeda/linux: auxdisplay: charlcd: replace zero-length array with flexible-array member auxdisplay: img-ascii-lcd: convert to devm_platform_ioremap_resource auxdisplay: Fix Kconfig indentation

drivers/auxdisplay/charlcd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ struct charlcd_priv {
		int len;
		} esc_seq;

		unsigned long long drvdata[0];
		unsigned long long drvdata[];
		};

		#define charlcd_to_priv(p) container_of(p, struct charlcd_priv, lcd)

drivers/auxdisplay/img-ascii-lcd.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -356,7 +356,6 @@ static int img_ascii_lcd_probe(struct platform_device *pdev)
		const struct of_device_id *match;
		const struct img_ascii_lcd_config *cfg;
		struct img_ascii_lcd_ctx *ctx;
		struct resource *res;
		int err;

		match = of_match_device(img_ascii_lcd_matches, &pdev->dev);
		@@ -378,8 +377,7 @@ static int img_ascii_lcd_probe(struct platform_device *pdev)
		&ctx->offset))
		return -EINVAL;
		} else {
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		ctx->base = devm_ioremap_resource(&pdev->dev, res);
		ctx->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(ctx->base))
		return PTR_ERR(ctx->base);
		}

drivers/auxdisplay/Kconfig

+8 −8

File changed.

Contains only whitespace changes.

Admin message