Commit 05deb1ce authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Lee Jones
Browse files

HID: picoLCD: Replace check_fb in favor of struct fb_info.lcd_dev 



Store the lcd device in struct fb_info.lcd_dev. The lcd subsystem can
now detect the lcd's fbdev device from this field.

This makes the implementation of check_fb in picolcd_lcdops obsolete.
Remove it.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Acked-by: default avatarJiri Kosina <jkosina@suse.com>
Link: https://lore.kernel.org/r/20240906075439.98476-26-tzimmermann@suse.de


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 16d6110e

drivers/hid/hid-picolcd_fb.c

+4 −0
Original line number Diff line number Diff line
@@ -497,6 +497,10 @@ int picolcd_init_framebuffer(struct picolcd_data *data) 
#endif

#endif



#ifdef CONFIG_HID_PICOLCD_LCD

	info->lcd_dev = data->lcd;

#endif



	fbdata = info->par;

	spin_lock_init(&fbdata->lock);

	fbdata->picolcd = data;

drivers/hid/hid-picolcd_lcd.c

+0 −6
Original line number Diff line number Diff line
@@ -41,15 +41,9 @@ static int picolcd_set_contrast(struct lcd_device *ldev, int contrast) 
	return 0;

}



static int picolcd_check_lcd_fb(struct lcd_device *ldev, struct fb_info *fb)

{

	return fb && fb == picolcd_fbinfo((struct picolcd_data *)lcd_get_data(ldev));

}



static const struct lcd_ops picolcd_lcdops = {

	.get_contrast   = picolcd_get_contrast,

	.set_contrast   = picolcd_set_contrast,

	.check_fb       = picolcd_check_lcd_fb,

};



int picolcd_init_lcd(struct picolcd_data *data, struct hid_report *report)