Commit 2f8c4f50 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'auxdisplay-for-v6.11-tag1' of... 

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
parents eb966e0c 2ccfe94b

drivers/auxdisplay/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ endif # PARPORT_PANEL 


config PANEL_CHANGE_MESSAGE

	bool "Change LCD initialization message ?"

	depends on CHARLCD

	depends on CHARLCD || LINEDISP

	help

	  This allows you to replace the boot message indicating the kernel version

	  and the driver version with a custom message. This is useful on appliances

drivers/auxdisplay/arm-charlcd.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int __init charlcd_probe(struct platform_device *pdev) 
	struct charlcd *lcd;

	struct resource *res;



	lcd = kzalloc(sizeof(struct charlcd), GFP_KERNEL);

	lcd = kzalloc(sizeof(*lcd), GFP_KERNEL);

	if (!lcd)

		return -ENOMEM;

drivers/auxdisplay/charlcd.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ enum charlcd_lines { 
	CHARLCD_LINES_2,

};



struct charlcd_ops;



struct charlcd {

	const struct charlcd_ops *ops;

	const unsigned char *char_conv;	/* Optional */

drivers/auxdisplay/hd44780.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int hd44780_probe(struct platform_device *pdev) 
	if (!lcd)

		goto fail1;



	hd = kzalloc(sizeof(struct hd44780), GFP_KERNEL);

	hd = kzalloc(sizeof(*hd), GFP_KERNEL);

	if (!hd)

		goto fail2;

drivers/auxdisplay/hd44780_common.c

+1 −0
Original line number Diff line number Diff line
@@ -366,4 +366,5 @@ struct hd44780_common *hd44780_common_alloc(void) 
}

EXPORT_SYMBOL_GPL(hd44780_common_alloc);



MODULE_DESCRIPTION("Common functions for HD44780 (and compatibles) LCD displays");

MODULE_LICENSE("GPL");