video sysfs support: Add dev argument for backlight_device_register
Subsystems (5)
PATCH 9/19 video sysfs support: Add dev argument for backlight_device_register
From: Yu Luming <[email protected]>
This patch set adds generic abstract layer support for acpi video driver to have generic user interface to control backlight and output switch control by leveraging the existing backlight sysfs class driver, and by adding a new video output sysfs class driver.
This patch:
Add dev argument for backlight_device_register to link the class device to real device object. The platform specific driver should find a way to get the real device object for their video device.
[[email protected]: build fix]
[[email protected]: fix msi-laptop.c]
Signed-off-by Luming Yu <[email protected]>
Cc "Antonino A. Daplas" <[email protected]>
Cc "Brown, Len" <[email protected]>
Cc Greg KH <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/acpi/asus_acpi.c | 2 +- drivers/acpi/ibm_acpi.c | 2 +- drivers/acpi/toshiba_acpi.c | 3 ++- drivers/misc/msi-laptop.c | 3 ++- drivers/usb/misc/appledisplay.c | 2 +- drivers/video/backlight/backlight.c | 7 +++++-- include/linux/backlight.h | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-)
drivers/acpi/asus_acpi.c renamed from drivers/acpi/asus_acpi.c~video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register +1 -1
@@ -1400,7 +1400,7 @@ static int __init asus_acpi_init(void)return result; } - asus_backlight_device =backlight_device_register ("asus" ,NULL , + asus_backlight_device =backlight_device_register ("asus" ,NULL ,NULL , &asus_backlight_data);if (IS_ERR (asus_backlight_device)) {printk (KERN_ERR "Could not register asus backlight device\n" );
drivers/acpi/ibm_acpi.c renamed from drivers/acpi/ibm_acpi.c~video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register +1 -1
@@ -1714,7 +1714,7 @@ static struct backlight_properties ibm_bstatic int brightness_init (void ) { - ibm_backlight_device =backlight_device_register ("ibm" ,NULL , + ibm_backlight_device =backlight_device_register ("ibm" ,NULL ,NULL , &ibm_backlight_data);if (IS_ERR (ibm_backlight_device)) {printk (IBM_ERR "Could not register backlight device\n" );
drivers/acpi/toshiba_acpi.c renamed from drivers/acpi/toshiba_acpi.c~video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register +2 -1
@@ -590,7 +590,8 @@ static int __init toshiba_acpi_init(voidremove_proc_entry (PROC_TOSHIBA , acpi_root_dir); } - toshiba_backlight_device =backlight_device_register ("toshiba" ,NULL , + toshiba_backlight_device =backlight_device_register ("toshiba" ,NULL , +NULL , &toshiba_backlight_data);if (IS_ERR (toshiba_backlight_device)) {printk (KERN_ERR "Could not register toshiba backlight device\n" );
drivers/misc/msi-laptop.c renamed from drivers/misc/msi-laptop.c~video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register +2 -1
@@ -317,7 +317,8 @@ static int __init msi_init(void)/* Register backlight stuff */ - msibl_device =backlight_device_register ("msi-laptop-bl" ,NULL , &msibl_props); + msibl_device =backlight_device_register ("msi-laptop-bl" ,NULL ,NULL , + &msibl_props);if (IS_ERR (msibl_device))return PTR_ERR (msibl_device);
drivers/usb/misc/appledisplay.c renamed from drivers/usb/misc/appledisplay.c~video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register +1 -1
@@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb/* Register backlight device */ snprintf (bl_name,sizeof (bl_name),"appledisplay%d" ,atomic_inc_return (&count_displays) -1 ); - pdata->bd =backlight_device_register (bl_name, pdata, + pdata->bd =backlight_device_register (bl_name,NULL ,NULL , &appledisplay_bl_data);if (IS_ERR (pdata->bd)) {err ("appledisplay: Backlight registration failed" );
drivers/video/backlight/backlight.c renamed from drivers/video/backlight/backlight.c~video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register +5 -2
@@ -216,8 +216,10 @@ static const struct class_device_attribu* Creates and registers new backlight class_device. Returns either an * ERR_PTR() or a pointer to the newly allocated device. */ -struct backlight_device *backlight_device_register (const char *name,void *devdata, -struct backlight_properties *bp) +struct backlight_device *backlight_device_register (const char *name, +struct device *dev, +void *devdata, +struct backlight_properties *bp) {int i, rc;struct backlight_device *new_bd;
@@ -232,6 +234,7 @@ struct backlight_device *backlight_devic new_bd->props = bp;memset (&new_bd->class_dev,0 ,sizeof (new_bd->class_dev)); new_bd->class_dev.class = &backlight_class; + new_bd->class_dev.dev = dev;strlcpy (new_bd->class_dev.class_id, name,KOBJ_NAME_LEN );class_set_devdata (&new_bd->class_dev, devdata);
include/linux/backlight.h renamed from include/linux/backlight.h~video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register +1 -1
@@ -54,7 +54,7 @@ struct backlight_device { };extern struct backlight_device *backlight_device_register (const char *name, -void *devdata,struct backlight_properties *bp); +struct device *dev,void *devdata,struct backlight_properties *bp);extern void backlight_device_unregister (struct backlight_device *bd);#define to_backlight_device (obj) container_of(obj, struct backlight_device, class_dev)
_