mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-01 10:43:43 +00:00
backlight: hx8357: Make use of device properties
Convert the module to be property provider agnostic and allow it to be used on non-OF platforms. Include mod_devicetable.h explicitly to replace the dropped of.h which included mod_devicetable.h indirectly. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Link: https://lore.kernel.org/r/20240201144951.294215-2-andriy.shevchenko@linux.intel.com Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
parent
601eedb0b6
commit
64a633593e
@ -8,9 +8,9 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/lcd.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/property.h>
|
||||
#include <linux/spi/spi.h>
|
||||
|
||||
#define HX8357_NUM_IM_PINS 3
|
||||
@ -564,6 +564,8 @@ static struct lcd_ops hx8357_ops = {
|
||||
.get_power = hx8357_get_power,
|
||||
};
|
||||
|
||||
typedef int (*hx8357_init_fn)(struct lcd_device *);
|
||||
|
||||
static const struct of_device_id hx8357_dt_ids[] = {
|
||||
{
|
||||
.compatible = "himax,hx8357",
|
||||
@ -582,7 +584,7 @@ static int hx8357_probe(struct spi_device *spi)
|
||||
struct device *dev = &spi->dev;
|
||||
struct lcd_device *lcdev;
|
||||
struct hx8357_data *lcd;
|
||||
const struct of_device_id *match;
|
||||
hx8357_init_fn init_fn;
|
||||
int i, ret;
|
||||
|
||||
lcd = devm_kzalloc(&spi->dev, sizeof(*lcd), GFP_KERNEL);
|
||||
@ -597,8 +599,8 @@ static int hx8357_probe(struct spi_device *spi)
|
||||
|
||||
lcd->spi = spi;
|
||||
|
||||
match = of_match_device(hx8357_dt_ids, &spi->dev);
|
||||
if (!match || !match->data)
|
||||
init_fn = device_get_match_data(dev);
|
||||
if (!init_fn)
|
||||
return -EINVAL;
|
||||
|
||||
lcd->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
|
||||
@ -627,7 +629,7 @@ static int hx8357_probe(struct spi_device *spi)
|
||||
|
||||
hx8357_lcd_reset(lcdev);
|
||||
|
||||
ret = ((int (*)(struct lcd_device *))match->data)(lcdev);
|
||||
ret = init_fn(lcdev);
|
||||
if (ret) {
|
||||
dev_err(&spi->dev, "Couldn't initialize panel\n");
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user