mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Pull platform-drivers into test branch
This commit is contained in:
commit
40b20c257a
13 changed files with 53 additions and 22 deletions
|
|
@ -1834,7 +1834,7 @@ static void aty128_bl_init(struct aty128fb_par *par)
|
|||
|
||||
snprintf(name, sizeof(name), "aty128bl%d", info->node);
|
||||
|
||||
bd = backlight_device_register(name, par, &aty128_bl_data);
|
||||
bd = backlight_device_register(name, info->dev, par, &aty128_bl_data);
|
||||
if (IS_ERR(bd)) {
|
||||
info->bl_dev = NULL;
|
||||
printk(KERN_WARNING "aty128: Backlight registration failed\n");
|
||||
|
|
|
|||
|
|
@ -2211,7 +2211,7 @@ static void aty_bl_init(struct atyfb_par *par)
|
|||
|
||||
snprintf(name, sizeof(name), "atybl%d", info->node);
|
||||
|
||||
bd = backlight_device_register(name, par, &aty_bl_data);
|
||||
bd = backlight_device_register(name, info->dev, par, &aty_bl_data);
|
||||
if (IS_ERR(bd)) {
|
||||
info->bl_dev = NULL;
|
||||
printk(KERN_WARNING "aty: Backlight registration failed\n");
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
|
|||
|
||||
snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node);
|
||||
|
||||
bd = backlight_device_register(name, pdata, &radeon_bl_data);
|
||||
bd = backlight_device_register(name, rinfo->info->dev, pdata, &radeon_bl_data);
|
||||
if (IS_ERR(bd)) {
|
||||
rinfo->info->bl_dev = NULL;
|
||||
printk("radeonfb: Backlight registration failed\n");
|
||||
|
|
|
|||
|
|
@ -216,8 +216,10 @@ static const struct class_device_attribute bl_class_device_attributes[] = {
|
|||
* 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_device_register(const char *name, void *devda
|
|||
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);
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ void nvidia_bl_init(struct nvidia_par *par)
|
|||
|
||||
snprintf(name, sizeof(name), "nvidiabl%d", info->node);
|
||||
|
||||
bd = backlight_device_register(name, par, &nvidia_bl_data);
|
||||
bd = backlight_device_register(name, info->dev, par, &nvidia_bl_data);
|
||||
if (IS_ERR(bd)) {
|
||||
info->bl_dev = NULL;
|
||||
printk(KERN_WARNING "nvidia: Backlight registration failed\n");
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ static void riva_bl_init(struct riva_par *par)
|
|||
|
||||
snprintf(name, sizeof(name), "rivabl%d", info->node);
|
||||
|
||||
bd = backlight_device_register(name, par, &riva_bl_data);
|
||||
bd = backlight_device_register(name, info->dev, par, &riva_bl_data);
|
||||
if (IS_ERR(bd)) {
|
||||
info->bl_dev = NULL;
|
||||
printk(KERN_WARNING "riva: Backlight registration failed\n");
|
||||
|
|
|
|||
Loading…
Reference in a new issue