You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'akpm' (aka "Andrew's patch-bomb")
Andrew elucidates: - First installmeant of MM. We have a HUGE number of MM patches this time. It's crazy. - MAINTAINERS updates - backlight updates - leds - checkpatch updates - misc ELF stuff - rtc updates - reiserfs - procfs - some misc other bits * akpm: (124 commits) user namespace: make signal.c respect user namespaces workqueue: make alloc_workqueue() take printf fmt and args for name procfs: add hidepid= and gid= mount options procfs: parse mount options procfs: introduce the /proc/<pid>/map_files/ directory procfs: make proc_get_link to use dentry instead of inode signal: add block_sigmask() for adding sigmask to current->blocked sparc: make SA_NOMASK a synonym of SA_NODEFER reiserfs: don't lock root inode searching reiserfs: don't lock journal_init() reiserfs: delay reiserfs lock until journal initialization reiserfs: delete comments referring to the BKL drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030 drivers/rtc/: remove redundant spi driver bus initialization drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static rtc: convert drivers/rtc/* to use module_platform_driver() drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc() drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler ...
This commit is contained in:
Linus Torvalds
@@ -270,17 +270,7 @@ static struct platform_driver pm860x_backlight_driver = {
|
||||
.remove = pm860x_backlight_remove,
|
||||
};
|
||||
|
||||
static int __init pm860x_backlight_init(void)
|
||||
{
|
||||
return platform_driver_register(&pm860x_backlight_driver);
|
||||
}
|
||||
module_init(pm860x_backlight_init);
|
||||
|
||||
static void __exit pm860x_backlight_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&pm860x_backlight_driver);
|
||||
}
|
||||
module_exit(pm860x_backlight_exit);
|
||||
module_platform_driver(pm860x_backlight_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Backlight Driver for Marvell Semiconductor 88PM8606");
|
||||
MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
|
||||
|
||||
@@ -280,14 +280,6 @@ config BACKLIGHT_WM831X
|
||||
If you have a backlight driven by the ISINK and DCDC of a
|
||||
WM831x PMIC say y to enable the backlight driver for it.
|
||||
|
||||
config BACKLIGHT_ADX
|
||||
tristate "Avionic Design Xanthos Backlight Driver"
|
||||
depends on ARCH_PXA_ADX
|
||||
default y
|
||||
help
|
||||
Say Y to enable the backlight driver on Avionic Design Xanthos-based
|
||||
boards.
|
||||
|
||||
config BACKLIGHT_ADP5520
|
||||
tristate "Backlight Driver for ADP5520/ADP5501 using WLED"
|
||||
depends on PMIC_ADP5520
|
||||
|
||||
@@ -32,7 +32,6 @@ obj-$(CONFIG_BACKLIGHT_APPLE) += apple_bl.o
|
||||
obj-$(CONFIG_BACKLIGHT_TOSA) += tosa_bl.o
|
||||
obj-$(CONFIG_BACKLIGHT_SAHARA) += kb3886_bl.o
|
||||
obj-$(CONFIG_BACKLIGHT_WM831X) += wm831x_bl.o
|
||||
obj-$(CONFIG_BACKLIGHT_ADX) += adx_bl.o
|
||||
obj-$(CONFIG_BACKLIGHT_ADP5520) += adp5520_bl.o
|
||||
obj-$(CONFIG_BACKLIGHT_ADP8860) += adp8860_bl.o
|
||||
obj-$(CONFIG_BACKLIGHT_ADP8870) += adp8870_bl.o
|
||||
|
||||
@@ -384,17 +384,7 @@ static struct platform_driver adp5520_bl_driver = {
|
||||
.resume = adp5520_bl_resume,
|
||||
};
|
||||
|
||||
static int __init adp5520_bl_init(void)
|
||||
{
|
||||
return platform_driver_register(&adp5520_bl_driver);
|
||||
}
|
||||
module_init(adp5520_bl_init);
|
||||
|
||||
static void __exit adp5520_bl_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&adp5520_bl_driver);
|
||||
}
|
||||
module_exit(adp5520_bl_exit);
|
||||
module_platform_driver(adp5520_bl_driver);
|
||||
|
||||
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
|
||||
MODULE_DESCRIPTION("ADP5520(01) Backlight Driver");
|
||||
|
||||
@@ -1,182 +0,0 @@
|
||||
/*
|
||||
* linux/drivers/video/backlight/adx.c
|
||||
*
|
||||
* Copyright (C) 2009 Avionic Design GmbH
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* Written by Thierry Reding <thierry.reding@avionic-design.de>
|
||||
*/
|
||||
|
||||
#include <linux/backlight.h>
|
||||
#include <linux/fb.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
/* register definitions */
|
||||
#define ADX_BACKLIGHT_CONTROL 0x00
|
||||
#define ADX_BACKLIGHT_CONTROL_ENABLE (1 << 0)
|
||||
#define ADX_BACKLIGHT_BRIGHTNESS 0x08
|
||||
#define ADX_BACKLIGHT_STATUS 0x10
|
||||
#define ADX_BACKLIGHT_ERROR 0x18
|
||||
|
||||
struct adxbl {
|
||||
void __iomem *base;
|
||||
};
|
||||
|
||||
static int adx_backlight_update_status(struct backlight_device *bldev)
|
||||
{
|
||||
struct adxbl *bl = bl_get_data(bldev);
|
||||
u32 value;
|
||||
|
||||
value = bldev->props.brightness;
|
||||
writel(value, bl->base + ADX_BACKLIGHT_BRIGHTNESS);
|
||||
|
||||
value = readl(bl->base + ADX_BACKLIGHT_CONTROL);
|
||||
|
||||
if (bldev->props.state & BL_CORE_FBBLANK)
|
||||
value &= ~ADX_BACKLIGHT_CONTROL_ENABLE;
|
||||
else
|
||||
value |= ADX_BACKLIGHT_CONTROL_ENABLE;
|
||||
|
||||
writel(value, bl->base + ADX_BACKLIGHT_CONTROL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int adx_backlight_get_brightness(struct backlight_device *bldev)
|
||||
{
|
||||
struct adxbl *bl = bl_get_data(bldev);
|
||||
u32 brightness;
|
||||
|
||||
brightness = readl(bl->base + ADX_BACKLIGHT_BRIGHTNESS);
|
||||
return brightness & 0xff;
|
||||
}
|
||||
|
||||
static int adx_backlight_check_fb(struct backlight_device *bldev, struct fb_info *fb)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static const struct backlight_ops adx_backlight_ops = {
|
||||
.options = 0,
|
||||
.update_status = adx_backlight_update_status,
|
||||
.get_brightness = adx_backlight_get_brightness,
|
||||
.check_fb = adx_backlight_check_fb,
|
||||
};
|
||||
|
||||
static int __devinit adx_backlight_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct backlight_properties props;
|
||||
struct backlight_device *bldev;
|
||||
struct resource *res;
|
||||
struct adxbl *bl;
|
||||
int ret = 0;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
ret = -ENXIO;
|
||||
goto out;
|
||||
}
|
||||
|
||||
res = devm_request_mem_region(&pdev->dev, res->start,
|
||||
resource_size(res), res->name);
|
||||
if (!res) {
|
||||
ret = -ENXIO;
|
||||
goto out;
|
||||
}
|
||||
|
||||
bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
|
||||
if (!bl) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
bl->base = devm_ioremap_nocache(&pdev->dev, res->start,
|
||||
resource_size(res));
|
||||
if (!bl->base) {
|
||||
ret = -ENXIO;
|
||||
goto out;
|
||||
}
|
||||
|
||||
memset(&props, 0, sizeof(struct backlight_properties));
|
||||
props.type = BACKLIGHT_RAW;
|
||||
props.max_brightness = 0xff;
|
||||
bldev = backlight_device_register(dev_name(&pdev->dev), &pdev->dev,
|
||||
bl, &adx_backlight_ops, &props);
|
||||
if (IS_ERR(bldev)) {
|
||||
ret = PTR_ERR(bldev);
|
||||
goto out;
|
||||
}
|
||||
|
||||
bldev->props.brightness = 0xff;
|
||||
bldev->props.power = FB_BLANK_UNBLANK;
|
||||
|
||||
platform_set_drvdata(pdev, bldev);
|
||||
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit adx_backlight_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct backlight_device *bldev;
|
||||
int ret = 0;
|
||||
|
||||
bldev = platform_get_drvdata(pdev);
|
||||
bldev->props.power = FB_BLANK_UNBLANK;
|
||||
bldev->props.brightness = 0xff;
|
||||
backlight_update_status(bldev);
|
||||
backlight_device_unregister(bldev);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int adx_backlight_suspend(struct platform_device *pdev,
|
||||
pm_message_t state)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int adx_backlight_resume(struct platform_device *pdev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
#define adx_backlight_suspend NULL
|
||||
#define adx_backlight_resume NULL
|
||||
#endif
|
||||
|
||||
static struct platform_driver adx_backlight_driver = {
|
||||
.probe = adx_backlight_probe,
|
||||
.remove = __devexit_p(adx_backlight_remove),
|
||||
.suspend = adx_backlight_suspend,
|
||||
.resume = adx_backlight_resume,
|
||||
.driver = {
|
||||
.name = "adx-backlight",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init adx_backlight_init(void)
|
||||
{
|
||||
return platform_driver_register(&adx_backlight_driver);
|
||||
}
|
||||
|
||||
static void __exit adx_backlight_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&adx_backlight_driver);
|
||||
}
|
||||
|
||||
module_init(adx_backlight_init);
|
||||
module_exit(adx_backlight_exit);
|
||||
|
||||
MODULE_AUTHOR("Thierry Reding <thierry.reding@avionic-design.de>");
|
||||
MODULE_DESCRIPTION("Avionic Design Xanthos Backlight Driver");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
@@ -102,7 +102,7 @@ static void backlight_generate_event(struct backlight_device *bd,
|
||||
}
|
||||
|
||||
static ssize_t backlight_show_power(struct device *dev,
|
||||
struct device_attribute *attr,char *buf)
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct backlight_device *bd = to_backlight_device(dev);
|
||||
|
||||
@@ -116,7 +116,7 @@ static ssize_t backlight_store_power(struct device *dev,
|
||||
struct backlight_device *bd = to_backlight_device(dev);
|
||||
unsigned long power;
|
||||
|
||||
rc = strict_strtoul(buf, 0, &power);
|
||||
rc = kstrtoul(buf, 0, &power);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
@@ -150,7 +150,7 @@ static ssize_t backlight_store_brightness(struct device *dev,
|
||||
struct backlight_device *bd = to_backlight_device(dev);
|
||||
unsigned long brightness;
|
||||
|
||||
rc = strict_strtoul(buf, 0, &brightness);
|
||||
rc = kstrtoul(buf, 0, &brightness);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
|
||||
@@ -199,17 +199,7 @@ static struct platform_driver da903x_backlight_driver = {
|
||||
.remove = da903x_backlight_remove,
|
||||
};
|
||||
|
||||
static int __init da903x_backlight_init(void)
|
||||
{
|
||||
return platform_driver_register(&da903x_backlight_driver);
|
||||
}
|
||||
module_init(da903x_backlight_init);
|
||||
|
||||
static void __exit da903x_backlight_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&da903x_backlight_driver);
|
||||
}
|
||||
module_exit(da903x_backlight_exit);
|
||||
module_platform_driver(da903x_backlight_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Backlight Driver for Dialog Semiconductor DA9030/DA9034");
|
||||
MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>"
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/fb.h>
|
||||
#include <linux/backlight.h>
|
||||
@@ -144,17 +143,7 @@ static struct platform_driver ep93xxbl_driver = {
|
||||
.resume = ep93xxbl_resume,
|
||||
};
|
||||
|
||||
static int __init ep93xxbl_init(void)
|
||||
{
|
||||
return platform_driver_register(&ep93xxbl_driver);
|
||||
}
|
||||
module_init(ep93xxbl_init);
|
||||
|
||||
static void __exit ep93xxbl_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&ep93xxbl_driver);
|
||||
}
|
||||
module_exit(ep93xxbl_exit);
|
||||
module_platform_driver(ep93xxbl_driver);
|
||||
|
||||
MODULE_DESCRIPTION("EP93xx Backlight Driver");
|
||||
MODULE_AUTHOR("H Hartley Sweeten <hsweeten@visionengravers.com>");
|
||||
|
||||
@@ -132,18 +132,7 @@ static struct platform_driver genericbl_driver = {
|
||||
},
|
||||
};
|
||||
|
||||
static int __init genericbl_init(void)
|
||||
{
|
||||
return platform_driver_register(&genericbl_driver);
|
||||
}
|
||||
|
||||
static void __exit genericbl_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&genericbl_driver);
|
||||
}
|
||||
|
||||
module_init(genericbl_init);
|
||||
module_exit(genericbl_exit);
|
||||
module_platform_driver(genericbl_driver);
|
||||
|
||||
MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
|
||||
MODULE_DESCRIPTION("Generic Backlight Driver");
|
||||
|
||||
@@ -147,19 +147,8 @@ static struct platform_driver jornada_bl_driver = {
|
||||
},
|
||||
};
|
||||
|
||||
static int __init jornada_bl_init(void)
|
||||
{
|
||||
return platform_driver_register(&jornada_bl_driver);
|
||||
}
|
||||
|
||||
static void __exit jornada_bl_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&jornada_bl_driver);
|
||||
}
|
||||
module_platform_driver(jornada_bl_driver);
|
||||
|
||||
MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson>");
|
||||
MODULE_DESCRIPTION("HP Jornada 710/720/728 Backlight driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
module_init(jornada_bl_init);
|
||||
module_exit(jornada_bl_exit);
|
||||
|
||||
@@ -135,19 +135,8 @@ static struct platform_driver jornada_lcd_driver = {
|
||||
},
|
||||
};
|
||||
|
||||
static int __init jornada_lcd_init(void)
|
||||
{
|
||||
return platform_driver_register(&jornada_lcd_driver);
|
||||
}
|
||||
|
||||
static void __exit jornada_lcd_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&jornada_lcd_driver);
|
||||
}
|
||||
module_platform_driver(jornada_lcd_driver);
|
||||
|
||||
MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
|
||||
MODULE_DESCRIPTION("HP Jornada 710/720/728 LCD driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
module_init(jornada_lcd_init);
|
||||
module_exit(jornada_lcd_exit);
|
||||
|
||||
@@ -97,19 +97,16 @@ static ssize_t lcd_store_power(struct device *dev,
|
||||
struct device_attribute *attr, const char *buf, size_t count)
|
||||
{
|
||||
int rc = -ENXIO;
|
||||
char *endp;
|
||||
struct lcd_device *ld = to_lcd_device(dev);
|
||||
int power = simple_strtoul(buf, &endp, 0);
|
||||
size_t size = endp - buf;
|
||||
unsigned long power;
|
||||
|
||||
if (isspace(*endp))
|
||||
size++;
|
||||
if (size != count)
|
||||
return -EINVAL;
|
||||
rc = kstrtoul(buf, 0, &power);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
mutex_lock(&ld->ops_lock);
|
||||
if (ld->ops && ld->ops->set_power) {
|
||||
pr_debug("lcd: set power to %d\n", power);
|
||||
pr_debug("lcd: set power to %lu\n", power);
|
||||
ld->ops->set_power(ld, power);
|
||||
rc = count;
|
||||
}
|
||||
@@ -136,19 +133,16 @@ static ssize_t lcd_store_contrast(struct device *dev,
|
||||
struct device_attribute *attr, const char *buf, size_t count)
|
||||
{
|
||||
int rc = -ENXIO;
|
||||
char *endp;
|
||||
struct lcd_device *ld = to_lcd_device(dev);
|
||||
int contrast = simple_strtoul(buf, &endp, 0);
|
||||
size_t size = endp - buf;
|
||||
unsigned long contrast;
|
||||
|
||||
if (isspace(*endp))
|
||||
size++;
|
||||
if (size != count)
|
||||
return -EINVAL;
|
||||
rc = kstrtoul(buf, 0, &contrast);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
mutex_lock(&ld->ops_lock);
|
||||
if (ld->ops && ld->ops->set_contrast) {
|
||||
pr_debug("lcd: set contrast to %d\n", contrast);
|
||||
pr_debug("lcd: set contrast to %lu\n", contrast);
|
||||
ld->ops->set_contrast(ld, contrast);
|
||||
rc = count;
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <linux/lcd.h>
|
||||
#include <linux/backlight.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
|
||||
#include "ld9040_gamma.h"
|
||||
|
||||
@@ -53,8 +54,51 @@ struct ld9040 {
|
||||
struct lcd_device *ld;
|
||||
struct backlight_device *bd;
|
||||
struct lcd_platform_data *lcd_pd;
|
||||
|
||||
struct mutex lock;
|
||||
bool enabled;
|
||||
};
|
||||
|
||||
static struct regulator_bulk_data supplies[] = {
|
||||
{ .supply = "vdd3", },
|
||||
{ .supply = "vci", },
|
||||
};
|
||||
|
||||
static void ld9040_regulator_enable(struct ld9040 *lcd)
|
||||
{
|
||||
int ret = 0;
|
||||
struct lcd_platform_data *pd = NULL;
|
||||
|
||||
pd = lcd->lcd_pd;
|
||||
mutex_lock(&lcd->lock);
|
||||
if (!lcd->enabled) {
|
||||
ret = regulator_bulk_enable(ARRAY_SIZE(supplies), supplies);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
lcd->enabled = true;
|
||||
}
|
||||
mdelay(pd->power_on_delay);
|
||||
out:
|
||||
mutex_unlock(&lcd->lock);
|
||||
}
|
||||
|
||||
static void ld9040_regulator_disable(struct ld9040 *lcd)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
mutex_lock(&lcd->lock);
|
||||
if (lcd->enabled) {
|
||||
ret = regulator_bulk_disable(ARRAY_SIZE(supplies), supplies);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
lcd->enabled = false;
|
||||
}
|
||||
out:
|
||||
mutex_unlock(&lcd->lock);
|
||||
}
|
||||
|
||||
static const unsigned short seq_swreset[] = {
|
||||
0x01, COMMAND_ONLY,
|
||||
ENDDEF, 0x00
|
||||
@@ -532,13 +576,8 @@ static int ld9040_power_on(struct ld9040 *lcd)
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
if (!pd->power_on) {
|
||||
dev_err(lcd->dev, "power_on is NULL.\n");
|
||||
return -EFAULT;
|
||||
} else {
|
||||
pd->power_on(lcd->ld, 1);
|
||||
mdelay(pd->power_on_delay);
|
||||
}
|
||||
/* lcd power on */
|
||||
ld9040_regulator_enable(lcd);
|
||||
|
||||
if (!pd->reset) {
|
||||
dev_err(lcd->dev, "reset is NULL.\n");
|
||||
@@ -582,11 +621,8 @@ static int ld9040_power_off(struct ld9040 *lcd)
|
||||
|
||||
mdelay(pd->power_off_delay);
|
||||
|
||||
if (!pd->power_on) {
|
||||
dev_err(lcd->dev, "power_on is NULL.\n");
|
||||
return -EFAULT;
|
||||
} else
|
||||
pd->power_on(lcd->ld, 0);
|
||||
/* lcd power off */
|
||||
ld9040_regulator_disable(lcd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -693,6 +729,14 @@ static int ld9040_probe(struct spi_device *spi)
|
||||
goto out_free_lcd;
|
||||
}
|
||||
|
||||
mutex_init(&lcd->lock);
|
||||
|
||||
ret = regulator_bulk_get(lcd->dev, ARRAY_SIZE(supplies), supplies);
|
||||
if (ret) {
|
||||
dev_err(lcd->dev, "Failed to get regulators: %d\n", ret);
|
||||
goto out_free_lcd;
|
||||
}
|
||||
|
||||
ld = lcd_device_register("ld9040", &spi->dev, lcd, &ld9040_lcd_ops);
|
||||
if (IS_ERR(ld)) {
|
||||
ret = PTR_ERR(ld);
|
||||
@@ -739,6 +783,8 @@ static int ld9040_probe(struct spi_device *spi)
|
||||
out_unregister_lcd:
|
||||
lcd_device_unregister(lcd->ld);
|
||||
out_free_lcd:
|
||||
regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
|
||||
|
||||
kfree(lcd);
|
||||
return ret;
|
||||
}
|
||||
@@ -750,6 +796,7 @@ static int __devexit ld9040_remove(struct spi_device *spi)
|
||||
ld9040_power(lcd, FB_BLANK_POWERDOWN);
|
||||
backlight_device_unregister(lcd->bd);
|
||||
lcd_device_unregister(lcd->ld);
|
||||
regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
|
||||
kfree(lcd);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -188,17 +188,7 @@ static struct platform_driver max8925_backlight_driver = {
|
||||
.remove = __devexit_p(max8925_backlight_remove),
|
||||
};
|
||||
|
||||
static int __init max8925_backlight_init(void)
|
||||
{
|
||||
return platform_driver_register(&max8925_backlight_driver);
|
||||
}
|
||||
module_init(max8925_backlight_init);
|
||||
|
||||
static void __exit max8925_backlight_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&max8925_backlight_driver);
|
||||
};
|
||||
module_exit(max8925_backlight_exit);
|
||||
module_platform_driver(max8925_backlight_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Backlight Driver for Maxim MAX8925");
|
||||
MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
|
||||
|
||||
@@ -195,18 +195,7 @@ static struct platform_driver omapbl_driver = {
|
||||
},
|
||||
};
|
||||
|
||||
static int __init omapbl_init(void)
|
||||
{
|
||||
return platform_driver_register(&omapbl_driver);
|
||||
}
|
||||
|
||||
static void __exit omapbl_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&omapbl_driver);
|
||||
}
|
||||
|
||||
module_init(omapbl_init);
|
||||
module_exit(omapbl_exit);
|
||||
module_platform_driver(omapbl_driver);
|
||||
|
||||
MODULE_AUTHOR("Andrzej Zaborowski <balrog@zabor.org>");
|
||||
MODULE_DESCRIPTION("OMAP LCD Backlight driver");
|
||||
|
||||
@@ -173,17 +173,7 @@ static struct platform_driver pcf50633_bl_driver = {
|
||||
},
|
||||
};
|
||||
|
||||
static int __init pcf50633_bl_init(void)
|
||||
{
|
||||
return platform_driver_register(&pcf50633_bl_driver);
|
||||
}
|
||||
module_init(pcf50633_bl_init);
|
||||
|
||||
static void __exit pcf50633_bl_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&pcf50633_bl_driver);
|
||||
}
|
||||
module_exit(pcf50633_bl_exit);
|
||||
module_platform_driver(pcf50633_bl_driver);
|
||||
|
||||
MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
|
||||
MODULE_DESCRIPTION("PCF50633 backlight driver");
|
||||
|
||||
@@ -85,7 +85,8 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
plcd = kzalloc(sizeof(struct platform_lcd), GFP_KERNEL);
|
||||
plcd = devm_kzalloc(&pdev->dev, sizeof(struct platform_lcd),
|
||||
GFP_KERNEL);
|
||||
if (!plcd) {
|
||||
dev_err(dev, "no memory for state\n");
|
||||
return -ENOMEM;
|
||||
@@ -98,7 +99,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(plcd->lcd)) {
|
||||
dev_err(dev, "cannot register lcd device\n");
|
||||
err = PTR_ERR(plcd->lcd);
|
||||
goto err_mem;
|
||||
goto err;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, plcd);
|
||||
@@ -106,8 +107,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev)
|
||||
|
||||
return 0;
|
||||
|
||||
err_mem:
|
||||
kfree(plcd);
|
||||
err:
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -116,7 +116,6 @@ static int __devexit platform_lcd_remove(struct platform_device *pdev)
|
||||
struct platform_lcd *plcd = platform_get_drvdata(pdev);
|
||||
|
||||
lcd_device_unregister(plcd->lcd);
|
||||
kfree(plcd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -157,18 +156,7 @@ static struct platform_driver platform_lcd_driver = {
|
||||
.resume = platform_lcd_resume,
|
||||
};
|
||||
|
||||
static int __init platform_lcd_init(void)
|
||||
{
|
||||
return platform_driver_register(&platform_lcd_driver);
|
||||
}
|
||||
|
||||
static void __exit platform_lcd_cleanup(void)
|
||||
{
|
||||
platform_driver_unregister(&platform_lcd_driver);
|
||||
}
|
||||
|
||||
module_init(platform_lcd_init);
|
||||
module_exit(platform_lcd_cleanup);
|
||||
module_platform_driver(platform_lcd_driver);
|
||||
|
||||
MODULE_AUTHOR("Ben Dooks <ben-linux@fluff.org>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
@@ -169,10 +169,9 @@ static int pwm_backlight_remove(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int pwm_backlight_suspend(struct platform_device *pdev,
|
||||
pm_message_t state)
|
||||
static int pwm_backlight_suspend(struct device *dev)
|
||||
{
|
||||
struct backlight_device *bl = platform_get_drvdata(pdev);
|
||||
struct backlight_device *bl = dev_get_drvdata(dev);
|
||||
struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
|
||||
|
||||
if (pb->notify)
|
||||
@@ -184,40 +183,32 @@ static int pwm_backlight_suspend(struct platform_device *pdev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pwm_backlight_resume(struct platform_device *pdev)
|
||||
static int pwm_backlight_resume(struct device *dev)
|
||||
{
|
||||
struct backlight_device *bl = platform_get_drvdata(pdev);
|
||||
struct backlight_device *bl = dev_get_drvdata(dev);
|
||||
|
||||
backlight_update_status(bl);
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
#define pwm_backlight_suspend NULL
|
||||
#define pwm_backlight_resume NULL
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend,
|
||||
pwm_backlight_resume);
|
||||
|
||||
#endif
|
||||
|
||||
static struct platform_driver pwm_backlight_driver = {
|
||||
.driver = {
|
||||
.name = "pwm-backlight",
|
||||
.owner = THIS_MODULE,
|
||||
#ifdef CONFIG_PM
|
||||
.pm = &pwm_backlight_pm_ops,
|
||||
#endif
|
||||
},
|
||||
.probe = pwm_backlight_probe,
|
||||
.remove = pwm_backlight_remove,
|
||||
.suspend = pwm_backlight_suspend,
|
||||
.resume = pwm_backlight_resume,
|
||||
};
|
||||
|
||||
static int __init pwm_backlight_init(void)
|
||||
{
|
||||
return platform_driver_register(&pwm_backlight_driver);
|
||||
}
|
||||
module_init(pwm_backlight_init);
|
||||
|
||||
static void __exit pwm_backlight_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&pwm_backlight_driver);
|
||||
}
|
||||
module_exit(pwm_backlight_exit);
|
||||
module_platform_driver(pwm_backlight_driver);
|
||||
|
||||
MODULE_DESCRIPTION("PWM based Backlight Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -236,17 +236,7 @@ static struct platform_driver wm831x_backlight_driver = {
|
||||
.remove = wm831x_backlight_remove,
|
||||
};
|
||||
|
||||
static int __init wm831x_backlight_init(void)
|
||||
{
|
||||
return platform_driver_register(&wm831x_backlight_driver);
|
||||
}
|
||||
module_init(wm831x_backlight_init);
|
||||
|
||||
static void __exit wm831x_backlight_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&wm831x_backlight_driver);
|
||||
}
|
||||
module_exit(wm831x_backlight_exit);
|
||||
module_platform_driver(wm831x_backlight_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Backlight Driver for WM831x PMICs");
|
||||
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com");
|
||||
|
||||
Reference in New Issue
Block a user