GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-27 17:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

A few minor auxdisplay improvements:

Browse source 
- charlcd: replace zero-length array with flexible-array member
     From the kernel-wide cleanup Gustavo A. R. Silva is performing
 
   - img-ascii-lcd: convert to devm_platform_ioremap_resource
     From Yangtao Li
 
   - Fix Kconfig indentation
     From Krzysztof Kozlowski
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPjU5OPd5QIZ9jqqOGXyLc2htIW0FAl5nuYwACgkQGXyLc2ht
 IW1bJQ//SghpbB2ArCM7/D2lblUs2DWdk3FvEpfQ4RmowFAM7bWZXH9w8Wfym+33
 dUUXMK3mTi7FFFFsYuX1hEP3KFctfP5M262pmXX/fNRZj36g3zwIr63Vpx3l3cdg
 5WwSxHUpJ8VpXfq+/wqNGNV+KenyIQDOyHefkf9zrhs/C5Da2YMwRTNK8WOITrgm
 W/RBeCBYsTRbXKJ9REXFbUFq0AawV1Fd6OzDTxbPmywRbtmGD9tyelcHPQSxasI7
 TMGJ7g2JVfdcM8jJFt7EKsehPgv2/2+oj5OxhY1m8L/tiIyIL7qwqMX5iG01YOkF
 pFEvTEGrSWSIruD+tMeV0nlVqBW0ZSwOFv3DkO5g3Yfn5SEDV3jRrcsw/BpcXOcH
 Tm1D3/AGT9mRtN1+gt3JnobGm0XJadu5u/dWngrM7KF9bua+dCMAlmIBugblwvwJ
 bTkMleiLHk3rA3AJLLreywbYNW/9qejbQ5EODHr7UrPSA0LPTWNPWD1fBsMKt/hw
 MXUVWMfLuo6sG9Tz9i3Suru1thrVzFHRVYioxfjUL6VhllyK//qzPIHk/oRKaiIo
 1hDs39fxptRgFggzIaKTuBvra9Uf+UOn/7fUIU3iNWm6OlXprGAOPMWyOIw/eC0s
 lxsYDzyOy7KCCFOU7cITAeU3eZhHzsCMR8dWGGkz8+KHG5WfnjI=
 =63zv
 -----END PGP SIGNATURE-----

Merge tag 'auxdisplay-for-linus-v5.6-rc6' of git://github.com/ojeda/linux

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
This commit is contained in:
Linus Torvalds 2020-03-10 15:32:57 -07:00
commit 2a48b37931
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/auxdisplay/charlcd.c
View file

@ -88,7 +88,7 @@ struct charlcd_priv {
int len; int len;
} esc_seq; } esc_seq;
unsigned long long drvdata[0]; unsigned long long drvdata[];
}; };
#define charlcd_to_priv(p) container_of(p, struct charlcd_priv, lcd) #define charlcd_to_priv(p) container_of(p, struct charlcd_priv, lcd)

4
drivers/auxdisplay/img-ascii-lcd.c
View file

@ -356,7 +356,6 @@ static int img_ascii_lcd_probe(struct platform_device *pdev)
const struct of_device_id *match; const struct of_device_id *match;
const struct img_ascii_lcd_config *cfg; const struct img_ascii_lcd_config *cfg;
struct img_ascii_lcd_ctx *ctx; struct img_ascii_lcd_ctx *ctx;
struct resource *res;
int err; int err;
match = of_match_device(img_ascii_lcd_matches, &pdev->dev); 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)) &ctx->offset))
return -EINVAL; return -EINVAL;
} else { } else {
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ctx->base = devm_platform_ioremap_resource(pdev, 0);
ctx->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(ctx->base)) if (IS_ERR(ctx->base))
return PTR_ERR(ctx->base); return PTR_ERR(ctx->base);
} }