diff options
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/Kconfig | 23 | ||||
| -rw-r--r-- | drivers/leds/led-class.c | 1 | ||||
| -rw-r--r-- | drivers/leds/led-core.c | 5 | ||||
| -rw-r--r-- | drivers/leds/leds-as3645a.c | 93 | ||||
| -rw-r--r-- | drivers/leds/leds-blinkm.c | 1 | ||||
| -rw-r--r-- | drivers/leds/leds-lt3593.c | 64 | ||||
| -rw-r--r-- | drivers/leds/leds-pca955x.c | 57 | ||||
| -rw-r--r-- | drivers/leds/leds-pca963x.c | 66 | ||||
| -rw-r--r-- | drivers/leds/uleds.c | 2 |
9 files changed, 108 insertions, 204 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 45914c66c852..71be87bdb926 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -23,8 +23,8 @@ config LEDS_CLASS_FLASH tristate "LED Flash Class Support" depends on LEDS_CLASS help - This option enables the flash led sysfs class in /sys/class/leds. - It wrapps LED Class and adds flash LEDs specific sysfs attributes + This option enables the flash LED sysfs class in /sys/class/leds. + It wraps LED Class and adds flash LEDs specific sysfs attributes and kernel internal API to it. You'll need this to provide support for the flash related features of a LED device. It can be built as a module. @@ -56,7 +56,7 @@ config LEDS_AAT1290 depends on OF depends on PINCTRL help - This option enables support for the LEDs on the AAT1290. + This option enables support for the LEDs on the AAT1290. config LEDS_AN30259A tristate "LED support for Panasonic AN30259A" @@ -423,13 +423,13 @@ config LEDS_CLEVO_MAIL This module can drive the mail LED for the following notebooks: - Clevo D400P - Clevo D410J - Clevo D410V - Clevo D400V/D470V (not tested, but might work) - Clevo M540N - Clevo M5x0N (not tested, but might work) - Positivo Mobile (Clevo M5x0V) + Clevo D400P + Clevo D410J + Clevo D410V + Clevo D400V/D470V (not tested, but might work) + Clevo M540N + Clevo M5x0N (not tested, but might work) + Positivo Mobile (Clevo M5x0V) If your model is not listed here you can try the "nodetect" module parameter. @@ -472,7 +472,7 @@ config LEDS_WM831X_STATUS depends on MFD_WM831X help This option enables support for the status LEDs of the WM831x - series of PMICs. + series of PMICs. config LEDS_WM8350 tristate "LED Support for WM8350 AudioPlus PMIC" @@ -543,6 +543,7 @@ config LEDS_LT3593 tristate "LED driver for LT3593 controllers" depends on LEDS_CLASS depends on GPIOLIB || COMPILE_TEST + depends on OF help This option enables support for LEDs driven by a Linear Technology LT3593 controller. This controller uses a special one-wire pulse diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 3c7e3487b373..85848c5da705 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -57,6 +57,7 @@ static ssize_t brightness_store(struct device *dev, if (state == LED_OFF) led_trigger_remove(led_cdev); led_set_brightness(led_cdev, state); + flush_work(&led_cdev->set_brightness_work); ret = size; unlock: diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index e3da7c03da1b..e9ae7f87ab90 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -164,6 +164,11 @@ static void led_blink_setup(struct led_classdev *led_cdev, unsigned long *delay_on, unsigned long *delay_off) { + /* + * If "set brightness to 0" is pending in workqueue, we don't + * want that to be reordered after blink_set() + */ + flush_work(&led_cdev->set_brightness_work); if (!test_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags) && led_cdev->blink_set && !led_cdev->blink_set(led_cdev, delay_on, delay_off)) diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c index 98a69b1a43f9..b0df514992e1 100644 --- a/drivers/leds/leds-as3645a.c +++ b/drivers/leds/leds-as3645a.c @@ -25,7 +25,7 @@ #include <linux/leds.h> #include <linux/module.h> #include <linux/mutex.h> -#include <linux/of.h> +#include <linux/property.h> #include <linux/slab.h> #include <media/v4l2-flash-led-class.h> @@ -148,8 +148,8 @@ struct as3645a { struct v4l2_flash *vf; struct v4l2_flash *vfind; - struct device_node *flash_node; - struct device_node *indicator_node; + struct fwnode_handle *flash_node; + struct fwnode_handle *indicator_node; struct as3645a_config cfg; @@ -493,30 +493,31 @@ static int as3645a_detect(struct as3645a *flash) static int as3645a_parse_node(struct as3645a *flash, struct as3645a_names *names, - struct device_node *node) + struct fwnode_handle *fwnode) { struct as3645a_config *cfg = &flash->cfg; - struct device_node *child; + struct fwnode_handle *child; const char *name; int rval; - for_each_child_of_node(node, child) { + fwnode_for_each_child_node(fwnode, child) { u32 id = 0; - of_property_read_u32(child, "reg", &id); + fwnode_property_read_u32(child, "reg", &id); switch (id) { case AS_LED_FLASH: - flash->flash_node = of_node_get(child); + flash->flash_node = child; break; case AS_LED_INDICATOR: - flash->indicator_node = of_node_get(child); + flash->indicator_node = child; break; default: dev_warn(&flash->client->dev, "unknown LED %u encountered, ignoring\n", id); break; } + fwnode_handle_get(child); } if (!flash->flash_node) { @@ -524,42 +525,46 @@ static int as3645a_parse_node(struct as3645a *flash, return -ENODEV; } - rval = of_property_read_string(flash->flash_node, "label", &name); - if (!rval) + rval = fwnode_property_read_string(flash->flash_node, "label", &name); + if (!rval) { strlcpy(names->flash, name, sizeof(names->flash)); - else + } else if (is_of_node(fwnode)) { snprintf(names->flash, sizeof(names->flash), - "%pOFn:flash", node); + "%pOFn:flash", to_of_node(fwnode)); + } else { + dev_err(&flash->client->dev, "flash node has no label!\n"); + return -EINVAL; + } - rval = of_property_read_u32(flash->flash_node, "flash-timeout-us", - &cfg->flash_timeout_us); + rval = fwnode_property_read_u32(flash->flash_node, "flash-timeout-us", + &cfg->flash_timeout_us); if (rval < 0) { dev_err(&flash->client->dev, "can't read flash-timeout-us property for flash\n"); goto out_err; } - rval = of_property_read_u32(flash->flash_node, "flash-max-microamp", - &cfg->flash_max_ua); + rval = fwnode_property_read_u32(flash->flash_node, "flash-max-microamp", + &cfg->flash_max_ua); if (rval < 0) { dev_err(&flash->client->dev, "can't read flash-max-microamp property for flash\n"); goto out_err; } - rval = of_property_read_u32(flash->flash_node, "led-max-microamp", - &cfg->assist_max_ua); + rval = fwnode_property_read_u32(flash->flash_node, "led-max-microamp", + &cfg->assist_max_ua); if (rval < 0) { dev_err(&flash->client->dev, "can't read led-max-microamp property for flash\n"); goto out_err; } - of_property_read_u32(flash->flash_node, "voltage-reference", - &cfg->voltage_reference); + fwnode_property_read_u32(flash->flash_node, "voltage-reference", + &cfg->voltage_reference); - of_property_read_u32(flash->flash_node, "ams,input-max-microamp", - &cfg->peak); + fwnode_property_read_u32(flash->flash_node, "ams,input-max-microamp", + &cfg->peak); cfg->peak = AS_PEAK_mA_TO_REG(cfg->peak); if (!flash->indicator_node) { @@ -568,15 +573,21 @@ static int as3645a_parse_node(struct as3645a *flash, goto out_err; } - rval = of_property_read_string(flash->indicator_node, "label", &name); - if (!rval) + rval = fwnode_property_read_string(flash->indicator_node, "label", + &name); + if (!rval) { strlcpy(names->indicator, name, sizeof(names->indicator)); - else + } else if (is_of_node(fwnode)) { snprintf(names->indicator, sizeof(names->indicator), - "%pOFn:indicator", node); + "%pOFn:indicator", to_of_node(fwnode)); + } else { + dev_err(&flash->client->dev, "indicator node has no label!\n"); + return -EINVAL; + } - rval = of_property_read_u32(flash->indicator_node, "led-max-microamp", - &cfg->indicator_max_ua); + rval = fwnode_property_read_u32(flash->indicator_node, + "led-max-microamp", + &cfg->indicator_max_ua); if (rval < 0) { dev_err(&flash->client->dev, "can't read led-max-microamp property for indicator\n"); @@ -586,8 +597,8 @@ static int as3645a_parse_node(struct as3645a *flash, return 0; out_err: - of_node_put(flash->flash_node); - of_node_put(flash->indicator_node); + fwnode_handle_put(flash->flash_node); + fwnode_handle_put(flash->indicator_node); return rval; } @@ -668,14 +679,14 @@ static int as3645a_v4l2_setup(struct as3645a *flash) strlcpy(cfgind.dev_name, flash->iled_cdev.name, sizeof(cfg.dev_name)); flash->vf = v4l2_flash_init( - &flash->client->dev, of_fwnode_handle(flash->flash_node), - &flash->fled, NULL, &cfg); + &flash->client->dev, flash->flash_node, &flash->fled, NULL, + &cfg); if (IS_ERR(flash->vf)) return PTR_ERR(flash->vf); flash->vfind = v4l2_flash_indicator_init( - &flash->client->dev, of_fwnode_handle(flash->indicator_node), - &flash->iled_cdev, &cfgind); + &flash->client->dev, flash->indicator_node, &flash->iled_cdev, + &cfgind); if (IS_ERR(flash->vfind)) { v4l2_flash_release(flash->vf); return PTR_ERR(flash->vfind); @@ -690,7 +701,7 @@ static int as3645a_probe(struct i2c_client *client) struct as3645a *flash; int rval; - if (client->dev.of_node == NULL) + if (!dev_fwnode(&client->dev)) return -ENODEV; flash = devm_kzalloc(&client->dev, sizeof(*flash), GFP_KERNEL); @@ -699,7 +710,7 @@ static int as3645a_probe(struct i2c_client *client) flash->client = client; - rval = as3645a_parse_node(flash, &names, client->dev.of_node); + rval = as3645a_parse_node(flash, &names, dev_fwnode(&client->dev)); if (rval < 0) return rval; @@ -731,8 +742,8 @@ out_mutex_destroy: mutex_destroy(&flash->mutex); out_put_nodes: - of_node_put(flash->flash_node); - of_node_put(flash->indicator_node); + fwnode_handle_put(flash->flash_node); + fwnode_handle_put(flash->indicator_node); return rval; } @@ -751,8 +762,8 @@ static int as3645a_remove(struct i2c_client *client) mutex_destroy(&flash->mutex); - of_node_put(flash->flash_node); - of_node_put(flash->indicator_node); + fwnode_handle_put(flash->flash_node); + fwnode_handle_put(flash->indicator_node); return 0; } diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c index 851c1920b63c..11b771fb933b 100644 --- a/drivers/leds/leds-blinkm.c +++ b/drivers/leds/leds-blinkm.c @@ -594,7 +594,6 @@ static int blinkm_probe(struct i2c_client *client, goto exit; } - data->i2c_addr = 0x09; data->i2c_addr = 0x08; /* i2c addr - use fake addr of 0x08 initially (real is 0x09) */ data->fw_ver = 0xfe; diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c index de3623e0d094..83e8e58d81cb 100644 --- a/drivers/leds/leds-lt3593.c +++ b/drivers/leds/leds-lt3593.c @@ -60,67 +60,14 @@ static int lt3593_led_set(struct led_classdev *led_cdev, return 0; } -static struct lt3593_led_data *lt3593_led_probe_pdata(struct device *dev) -{ - struct gpio_led_platform_data *pdata = dev_get_platdata(dev); - const struct gpio_led *template = &pdata->leds[0]; - struct lt3593_led_data *led_data; - int ret, state; - - if (pdata->num_leds != 1) - return ERR_PTR(-EINVAL); - - led_data = devm_kzalloc(dev, sizeof(*led_data), GFP_KERNEL); - if (!led_data) - return ERR_PTR(-ENOMEM); - - led_data->cdev.name = template->name; - led_data->cdev.default_trigger = template->default_trigger; - led_data->cdev.brightness_set_blocking = lt3593_led_set; - - state = (template->default_state == LEDS_GPIO_DEFSTATE_ON); - led_data->cdev.brightness = state ? LED_FULL : LED_OFF; - - if (!template->retain_state_suspended) - led_data->cdev.flags |= LED_CORE_SUSPENDRESUME; - - ret = devm_gpio_request_one(dev, template->gpio, state ? - GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW, - template->name); - if (ret < 0) - return ERR_PTR(ret); - - led_data->gpiod = gpio_to_desc(template->gpio); - if (!led_data->gpiod) - return ERR_PTR(-EPROBE_DEFER); - - ret = devm_led_classdev_register(dev, &led_data->cdev); - if (ret < 0) - return ERR_PTR(ret); - - dev_info(dev, "registered LT3593 LED '%s' at GPIO %d\n", - template->name, template->gpio); - - return led_data; -} - static int lt3593_led_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct lt3593_led_data *led_data; struct fwnode_handle *child; int ret, state = LEDS_GPIO_DEFSTATE_OFF; - enum gpiod_flags flags = GPIOD_OUT_LOW; const char *tmp; - if (dev_get_platdata(dev)) { - led_data = lt3593_led_probe_pdata(dev); - if (IS_ERR(led_data)) - return PTR_ERR(led_data); - - goto out; - } - if (!dev->of_node) return -ENODEV; @@ -151,13 +98,8 @@ static int lt3593_led_probe(struct platform_device *pdev) &led_data->cdev.default_trigger); if (!fwnode_property_read_string(child, "default-state", &tmp)) { - if (!strcmp(tmp, "keep")) { - state = LEDS_GPIO_DEFSTATE_KEEP; - flags = GPIOD_ASIS; - } else if (!strcmp(tmp, "on")) { + if (!strcmp(tmp, "on")) state = LEDS_GPIO_DEFSTATE_ON; - flags = GPIOD_OUT_HIGH; - } } led_data->cdev.name = led_data->name; @@ -171,20 +113,16 @@ static int lt3593_led_probe(struct platform_device *pdev) } led_data->cdev.dev->of_node = dev->of_node; - -out: platform_set_drvdata(pdev, led_data); return 0; } -#ifdef CONFIG_OF static const struct of_device_id of_lt3593_leds_match[] = { { .compatible = "lltc,lt3593", }, {}, }; MODULE_DEVICE_TABLE(of, of_lt3593_leds_match); -#endif static struct platform_driver lt3593_led_driver = { .probe = lt3593_led_probe, diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c index f51b356d4426..a9f5dad55956 100644 --- a/drivers/leds/leds-pca955x.c +++ b/drivers/leds/leds-pca955x.c @@ -40,7 +40,6 @@ * bits the chip supports. */ -#include <linux/acpi.h> #include <linux/ctype.h> #include <linux/delay.h> #include <linux/err.h> @@ -48,8 +47,8 @@ #include <linux/i2c.h> #include <linux/leds.h> #include <linux/module.h> -#include <linux/of_device.h> #include <linux/of.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/string.h> @@ -110,15 +109,6 @@ static const struct i2c_device_id pca955x_id[] = { }; MODULE_DEVICE_TABLE(i2c, pca955x_id); -static const struct acpi_device_id pca955x_acpi_ids[] = { - { "PCA9550", pca9550 }, - { "PCA9551", pca9551 }, - { "PCA9552", pca9552 }, - { "PCA9553", pca9553 }, - { } -}; -MODULE_DEVICE_TABLE(acpi, pca955x_acpi_ids); - struct pca955x { struct mutex lock; struct pca955x_led *leds; @@ -373,16 +363,14 @@ static int pca955x_gpio_direction_output(struct gpio_chip *gc, } #endif /* CONFIG_LEDS_PCA955X_GPIO */ -#if IS_ENABLED(CONFIG_OF) static struct pca955x_platform_data * -pca955x_pdata_of_init(struct i2c_client *client, struct pca955x_chipdef *chip) +pca955x_get_pdata(struct i2c_client *client, struct pca955x_chipdef *chip) { - struct device_node *np = client->dev.of_node; - struct device_node *child; struct pca955x_platform_data *pdata; + struct fwnode_handle *child; int count; - count = of_get_child_count(np); + count = device_get_child_node_count(&client->dev); if (!count || count > chip->bits) return ERR_PTR(-ENODEV); @@ -396,24 +384,25 @@ pca955x_pdata_of_init(struct i2c_client *client, struct pca955x_chipdef *chip) if (!pdata->leds) return ERR_PTR(-ENOMEM); - for_each_child_of_node(np, child) { + device_for_each_child_node(&client->dev, child) { const char *name; u32 reg; int res; - res = of_property_read_u32(child, "reg", ®); + res = fwnode_property_read_u32(child, "reg", ®); if ((res != 0) || (reg >= chip->bits)) continue; - if (of_property_read_string(child, "label", &name)) - name = child->name; + res = fwnode_property_read_string(child, "label", &name); + if ((res != 0) && is_of_node(child)) + name = to_of_node(child)->name; snprintf(pdata->leds[reg].name, sizeof(pdata->leds[reg].name), "%s", name); pdata->leds[reg].type = PCA955X_TYPE_LED; - of_property_read_u32(child, "type", &pdata->leds[reg].type); - of_property_read_string(child, "linux,default-trigger", + fwnode_property_read_u32(child, "type", &pdata->leds[reg].type); + fwnode_property_read_string(child, "linux,default-trigger", &pdata->leds[reg].default_trigger); } @@ -429,15 +418,7 @@ static const struct of_device_id of_pca955x_match[] = { { .compatible = "nxp,pca9553", .data = (void *)pca9553 }, {}, }; - MODULE_DEVICE_TABLE(of, of_pca955x_match); -#else -static struct pca955x_platform_data * -pca955x_pdata_of_init(struct i2c_client *client, struct pca955x_chipdef *chip) -{ - return ERR_PTR(-ENODEV); -} -#endif static int pca955x_probe(struct i2c_client *client, const struct i2c_device_id *id) @@ -450,20 +431,11 @@ static int pca955x_probe(struct i2c_client *client, struct pca955x_platform_data *pdata; int ngpios = 0; - if (id) { - chip = &pca955x_chipdefs[id->driver_data]; - } else { - const struct acpi_device_id *acpi_id; - - acpi_id = acpi_match_device(pca955x_acpi_ids, &client->dev); - if (!acpi_id) - return -ENODEV; - chip = &pca955x_chipdefs[acpi_id->driver_data]; - } + chip = &pca955x_chipdefs[id->driver_data]; adapter = to_i2c_adapter(client->dev.parent); pdata = dev_get_platdata(&client->dev); if (!pdata) { - pdata = pca955x_pdata_of_init(client, chip); + pdata = pca955x_get_pdata(client, chip); if (IS_ERR(pdata)) return PTR_ERR(pdata); } @@ -602,8 +574,7 @@ static int pca955x_probe(struct i2c_client *client, static struct i2c_driver pca955x_driver = { .driver = { .name = "leds-pca955x", - .acpi_match_table = ACPI_PTR(pca955x_acpi_ids), - .of_match_table = of_match_ptr(of_pca955x_match), + .of_match_table = of_pca955x_match, }, .probe = pca955x_probe, .id_table = pca955x_id, diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c index 5c0908113e38..9b4ef070d956 100644 --- a/drivers/leds/leds-pca963x.c +++ b/drivers/leds/leds-pca963x.c @@ -25,7 +25,6 @@ * or by adding the 'nxp,hw-blink' property to the DTS. */ -#include <linux/acpi.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/string.h> @@ -33,6 +32,7 @@ #include <linux/leds.h> #include <linux/err.h> #include <linux/i2c.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/of.h> #include <linux/platform_data/leds-pca963x.h> @@ -97,15 +97,6 @@ static const struct i2c_device_id pca963x_id[] = { }; MODULE_DEVICE_TABLE(i2c, pca963x_id); -static const struct acpi_device_id pca963x_acpi_ids[] = { - { "PCA9632", pca9633 }, - { "PCA9633", pca9633 }, - { "PCA9634", pca9634 }, - { "PCA9635", pca9635 }, - { } -}; -MODULE_DEVICE_TABLE(acpi, pca963x_acpi_ids); - struct pca963x_led; struct pca963x { @@ -287,16 +278,15 @@ static int pca963x_blink_set(struct led_classdev *led_cdev, return 0; } -#if IS_ENABLED(CONFIG_OF) static struct pca963x_platform_data * -pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip) +pca963x_get_pdata(struct i2c_client *client, struct pca963x_chipdef *chip) { - struct device_node *np = client->dev.of_node, *child; struct pca963x_platform_data *pdata; struct led_info *pca963x_leds; + struct fwnode_handle *child; int count; - count = of_get_child_count(np); + count = device_get_child_node_count(&client->dev); if (!count || count > chip->n_leds) return ERR_PTR(-ENODEV); @@ -305,18 +295,22 @@ pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip) if (!pca963x_leds) return ERR_PTR(-ENOMEM); - for_each_child_of_node(np, child) { + device_for_each_child_node(&client->dev, child) { struct led_info led = {}; u32 reg; int res; - res = of_property_read_u32(child, "reg", ®); + res = fwnode_property_read_u32(child, "reg", ®); if ((res != 0) || (reg >= chip->n_leds)) continue; - led.name = - of_get_property(child, "label", NULL) ? : child->name; - led.default_trigger = - of_get_property(child, "linux,default-trigger", NULL); + + res = fwnode_property_read_string(child, "label", &led.name); + if ((res != 0) && is_of_node(child)) + led.name = to_of_node(child)->name; + + fwnode_property_read_string(child, "linux,default-trigger", + &led.default_trigger); + pca963x_leds[reg] = led; } pdata = devm_kzalloc(&client->dev, @@ -328,22 +322,23 @@ pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip) pdata->leds.num_leds = chip->n_leds; /* default to open-drain unless totem pole (push-pull) is specified */ - if (of_property_read_bool(np, "nxp,totem-pole")) + if (device_property_read_bool(&client->dev, "nxp,totem-pole")) pdata->outdrv = PCA963X_TOTEM_POLE; else pdata->outdrv = PCA963X_OPEN_DRAIN; /* default to software blinking unless hardware blinking is specified */ - if (of_property_read_bool(np, "nxp,hw-blink")) + if (device_property_read_bool(&client->dev, "nxp,hw-blink")) pdata->blink_type = PCA963X_HW_BLINK; else pdata->blink_type = PCA963X_SW_BLINK; - if (of_property_read_u32(np, "nxp,period-scale", &chip->scaling)) + if (device_property_read_u32(&client->dev, "nxp,period-scale", + &chip->scaling)) chip->scaling = 1000; /* default to non-inverted output, unless inverted is specified */ - if (of_property_read_bool(np, "nxp,inverted-out")) + if (device_property_read_bool(&client->dev, "nxp,inverted-out")) pdata->dir = PCA963X_INVERTED; else pdata->dir = PCA963X_NORMAL; @@ -359,13 +354,6 @@ static const struct of_device_id of_pca963x_match[] = { {}, }; MODULE_DEVICE_TABLE(of, of_pca963x_match); -#else -static struct pca963x_platform_data * -pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip) -{ - return ERR_PTR(-ENODEV); -} -#endif static int pca963x_probe(struct i2c_client *client, const struct i2c_device_id *id) @@ -376,20 +364,11 @@ static int pca963x_probe(struct i2c_client *client, struct pca963x_chipdef *chip; int i, err; - if (id) { - chip = &pca963x_chipdefs[id->driver_data]; - } else { - const struct acpi_device_id *acpi_id; - - acpi_id = acpi_match_device(pca963x_acpi_ids, &client->dev); - if (!acpi_id) - return -ENODEV; - chip = &pca963x_chipdefs[acpi_id->driver_data]; - } + chip = &pca963x_chipdefs[id->driver_data]; pdata = dev_get_platdata(&client->dev); if (!pdata) { - pdata = pca963x_dt_init(client, chip); + pdata = pca963x_get_pdata(client, chip); if (IS_ERR(pdata)) { dev_warn(&client->dev, "could not parse configuration\n"); pdata = NULL; @@ -495,8 +474,7 @@ static int pca963x_remove(struct i2c_client *client) static struct i2c_driver pca963x_driver = { .driver = { .name = "leds-pca963x", - .of_match_table = of_match_ptr(of_pca963x_match), - .acpi_match_table = ACPI_PTR(pca963x_acpi_ids), + .of_match_table = of_pca963x_match, }, .probe = pca963x_probe, .remove = pca963x_remove, diff --git a/drivers/leds/uleds.c b/drivers/leds/uleds.c index 0c43bfac9598..08b6a769ff8f 100644 --- a/drivers/leds/uleds.c +++ b/drivers/leds/uleds.c @@ -74,7 +74,7 @@ static int uleds_open(struct inode *inode, struct file *file) udev->state = ULEDS_STATE_UNKNOWN; file->private_data = udev; - nonseekable_open(inode, file); + stream_open(inode, file); return 0; } |