korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 05:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

auxdisplay changes for v6.8

Browse Source 
A single cleanup for 'img-ascii-lcd': use 'device_get_match_data()'.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPjU5OPd5QIZ9jqqOGXyLc2htIW0FAmWbVV4ACgkQGXyLc2ht
 IW1kWhAAuMnGFyIQQAdsCLG2aggD1B3bbkQ3bZJLV39EoHBeIvpnumXMVV1yip+s
 1O+2qFmEeGPluzaJdOMl0d1/eoInBmph9yy8izKRksJQpycrQzv/BoT9MkCKy0Xc
 efJuoqH3CsP0NYTAxjXBeyS/W8vq6wZuNlTYbBuXKA7nXIH44HmmVeSdjXtwSWPz
 WjvjXkXvyj3tzocIReDhWT7aN+uXPluEm02cwpbZB2307VCwcx4ClGwzo8jXY8CZ
 uIY7X7mnN3E18cde7LD6k5oAFLQ4cl32grKw2eErQJmmx52j5hr7fq0ici7OeE++
 N/YC1QzXWI3aKjIvgiGYALU0jy3C5yA3ZeFO/roN81K0HW9MlrWbv5k+CCnhhVoK
 6d2wxfFuXx/mIDXZXFBoAfZ7TMWd5AT8BQ6YK1DOyAtS/3QI9qqroW/p5bKHIENU
 jVcQesMgOL3baSDlqjsCxhJ7IPqxBGUOiMn6RN8PKHWZMuA6izD1w+Nm/US+CLSs
 6Iju+l2tjFv9+yA4JPuPu6gORdiBeFhNCGK1cFU0l/Gb6ZfSUpMm5vTafd+4eFIV
 PCN25vDyptZ/DACTU8S3A7RJmjXU9/kJLNgoSsfNB+I7ynOsQysgKLquEmbVfjVF
 P0oLBsAzNcEHZyE98HBo3rR7L9d+nLPHa4MNG06RE4DMYPbzjbg=
 =tp0c
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Linus Torvalds 2024-01-11 13:12:59 -08:00
commit 457e4f9976
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/auxdisplay/img-ascii-lcd.c
View File

@ -8,9 +8,9 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_address.h> #include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -225,17 +225,11 @@ MODULE_DEVICE_TABLE(of, img_ascii_lcd_matches);
*/ */
static int img_ascii_lcd_probe(struct platform_device *pdev) 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 device *dev = &pdev->dev;
const struct img_ascii_lcd_config *cfg = device_get_match_data(dev);
struct img_ascii_lcd_ctx *ctx; struct img_ascii_lcd_ctx *ctx;
int err; int err;
match = of_match_device(img_ascii_lcd_matches, dev);
if (!match)
return -ENODEV;
cfg = match->data;
ctx = devm_kzalloc(dev, sizeof(*ctx) + cfg->num_chars, GFP_KERNEL); ctx = devm_kzalloc(dev, sizeof(*ctx) + cfg->num_chars, GFP_KERNEL);
if (!ctx) if (!ctx)
return -ENOMEM; return -ENOMEM;