diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:04 +0100 |
| commit | b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d (patch) | |
| tree | c7bf18bd3f6eef491dd62d383f836e4536c811cb /drivers/video | |
| parent | ac9c1beb361e3c71e0b9b59d38e5022f12c263c6 (diff) | |
| parent | 459bf1fd31da2c091c6c1e3a7e0f6a1b1cbf588b (diff) | |
| download | barebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.gz barebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/mtl017.c | 10 | ||||
| -rw-r--r-- | drivers/video/rave-sp-backlight.c | 1 | ||||
| -rw-r--r-- | drivers/video/ssd1307fb.c | 10 | ||||
| -rw-r--r-- | drivers/video/tc358767.c | 8 |
4 files changed, 4 insertions, 25 deletions
diff --git a/drivers/video/mtl017.c b/drivers/video/mtl017.c index 1a1f686223..085ea110ba 100644 --- a/drivers/video/mtl017.c +++ b/drivers/video/mtl017.c @@ -16,7 +16,6 @@ * */ #include <common.h> -#include <init.h> #include <driver.h> #include <xfuncs.h> #include <errno.h> @@ -270,11 +269,4 @@ static struct driver_d twl_driver = { .name = "mtl017", .probe = mtl017_probe, }; - -static int mtl017_init(void) -{ - i2c_driver_register(&twl_driver); - return 0; -} - -device_initcall(mtl017_init); +device_i2c_driver(twl_driver); diff --git a/drivers/video/rave-sp-backlight.c b/drivers/video/rave-sp-backlight.c index 88ec86e730..3a20def661 100644 --- a/drivers/video/rave-sp-backlight.c +++ b/drivers/video/rave-sp-backlight.c @@ -46,6 +46,7 @@ static int rave_sp_backlight_probe(struct device_d *dev) bd = xzalloc(sizeof(*bd)); bd->dev.priv = dev->parent->priv; + bd->dev.parent = dev; bd->brightness_default = 50; bd->brightness_max = 100; bd->brightness_set = rave_sp_backlight_set; diff --git a/drivers/video/ssd1307fb.c b/drivers/video/ssd1307fb.c index 54e02e7220..d68f0c5056 100644 --- a/drivers/video/ssd1307fb.c +++ b/drivers/video/ssd1307fb.c @@ -18,7 +18,6 @@ */ #include <common.h> -#include <init.h> #include <fb.h> #include <i2c/i2c.h> #include <of_device.h> @@ -581,11 +580,4 @@ static struct driver_d ssd1307fb_driver = { .probe = ssd1307fb_probe, .of_compatible = DRV_OF_COMPAT(ssd1307fb_of_match), }; - -static int ssd1307_init(void) -{ - i2c_driver_register(&ssd1307fb_driver); - return 0; -} - -device_initcall(ssd1307_init); +device_i2c_driver(ssd1307fb_driver); diff --git a/drivers/video/tc358767.c b/drivers/video/tc358767.c index 125e8236c1..e64dde1ddf 100644 --- a/drivers/video/tc358767.c +++ b/drivers/video/tc358767.c @@ -20,7 +20,6 @@ */ #include <common.h> -#include <init.h> #include <driver.h> #include <malloc.h> #include <errno.h> @@ -1434,9 +1433,4 @@ static struct driver_d tc_driver = { .name = "tc358767", .probe = tc_probe, }; - -static int tc_init(void) -{ - return i2c_driver_register(&tc_driver); -} -device_initcall(tc_init); +device_i2c_driver(tc_driver); |