tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'auxdisplay-for-v6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull auxdisplay updates from Geert Uytterhoeven:

- add support for configuring the boot message on line displays

- miscellaneous fixes and improvements

* tag 'auxdisplay-for-v6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
auxdisplay: ht16k33: Drop reference after LED registration
auxdisplay: Use sizeof(*pointer) instead of sizeof(type)
auxdisplay: hd44780: add missing MODULE_DESCRIPTION() macro
auxdisplay: linedisp: add missing MODULE_DESCRIPTION() macro
auxdisplay: linedisp: Support configuring the boot message
auxdisplay: charlcd: Provide a forward declaration

Linus Torvalds 2f8c4f50 eb966e0c

+17 -4
+1 -1
drivers/auxdisplay/Kconfig
··· 316 316 317 317 config PANEL_CHANGE_MESSAGE 318 318 bool "Change LCD initialization message ?" 319 - depends on CHARLCD 319 + depends on CHARLCD || LINEDISP 320 320 help 321 321 This allows you to replace the boot message indicating the kernel version 322 322 and the driver version with a custom message. This is useful on appliances
+1 -1
drivers/auxdisplay/arm-charlcd.c
··· 270 270 struct charlcd *lcd; 271 271 struct resource *res; 272 272 273 - lcd = kzalloc(sizeof(struct charlcd), GFP_KERNEL); 273 + lcd = kzalloc(sizeof(*lcd), GFP_KERNEL); 274 274 if (!lcd) 275 275 return -ENOMEM; 276 276
+2
drivers/auxdisplay/charlcd.h
··· 36 36 CHARLCD_LINES_2, 37 37 }; 38 38 39 + struct charlcd_ops; 40 + 39 41 struct charlcd { 40 42 const struct charlcd_ops *ops; 41 43 const unsigned char *char_conv; /* Optional */
+1 -1
drivers/auxdisplay/hd44780.c
··· 230 230 if (!lcd) 231 231 goto fail1; 232 232 233 - hd = kzalloc(sizeof(struct hd44780), GFP_KERNEL); 233 + hd = kzalloc(sizeof(*hd), GFP_KERNEL); 234 234 if (!hd) 235 235 goto fail2; 236 236
+1
drivers/auxdisplay/hd44780_common.c
··· 366 366 } 367 367 EXPORT_SYMBOL_GPL(hd44780_common_alloc); 368 368 369 + MODULE_DESCRIPTION("Common functions for HD44780 (and compatibles) LCD displays"); 369 370 MODULE_LICENSE("GPL");
+1
drivers/auxdisplay/ht16k33.c
··· 483 483 led->max_brightness = MAX_BRIGHTNESS; 484 484 485 485 err = devm_led_classdev_register_ext(dev, led, &init_data); 486 + fwnode_handle_put(init_data.fwnode); 486 487 if (err) 487 488 dev_err(dev, "Failed to register LED\n"); 488 489
+10 -1
drivers/auxdisplay/line-display.c
··· 8 8 * Copyright (C) 2021 Glider bv 9 9 */ 10 10 11 + #ifndef CONFIG_PANEL_BOOT_MESSAGE 11 12 #include <generated/utsrelease.h> 13 + #endif 12 14 13 15 #include <linux/container_of.h> 14 16 #include <linux/device.h> ··· 314 312 return 0; 315 313 } 316 314 315 + #ifdef CONFIG_PANEL_BOOT_MESSAGE 316 + #define LINEDISP_INIT_TEXT CONFIG_PANEL_BOOT_MESSAGE 317 + #else 318 + #define LINEDISP_INIT_TEXT "Linux " UTS_RELEASE " " 319 + #endif 320 + 317 321 /** 318 322 * linedisp_register - register a character line display 319 323 * @linedisp: pointer to character line display structure ··· 367 359 goto out_del_timer; 368 360 369 361 /* display a default message */ 370 - err = linedisp_display(linedisp, "Linux " UTS_RELEASE " ", -1); 362 + err = linedisp_display(linedisp, LINEDISP_INIT_TEXT, -1); 371 363 if (err) 372 364 goto out_del_dev; 373 365 ··· 396 388 } 397 389 EXPORT_SYMBOL_NS_GPL(linedisp_unregister, LINEDISP); 398 390 391 + MODULE_DESCRIPTION("Character line display core support"); 399 392 MODULE_LICENSE("GPL");