298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-15 18:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubnt-ledbar: fix compilation error

Browse Source
This commit is contained in:
coolsnowwolf 2024-11-14 11:31:21 +08:00
parent cb33d17dba
commit 0404234acb
2 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/ubnt-ledbar/Makefile
View File

@ -20,7 +20,7 @@ define KernelPackage/leds-ubnt-ledbar
FILES:= \ FILES:= \
$(PKG_BUILD_DIR)/leds-ubnt-ledbar.ko $(PKG_BUILD_DIR)/leds-ubnt-ledbar.ko
AUTOLOAD:=$(call AutoProbe,leds-ubnt-ledbar,1) AUTOLOAD:=$(call AutoProbe,leds-ubnt-ledbar,1)
DEPENDS:=+kmod-i2c-core DEPENDS:=@TARGET_mediatek_mt7622||TARGET_ramips_mt7621 +kmod-i2c-core
endef endef
define KernelPackage/leds-ubnt-ledbar/description define KernelPackage/leds-ubnt-ledbar/description

42
package/kernel/ubnt-ledbar/src/leds-ubnt-ledbar.c
View File

@ -149,7 +149,6 @@ static int ubnt_ledbar_init_led(struct device_node *np, struct ubnt_ledbar *ledb
struct led_classdev *led_cdev) struct led_classdev *led_cdev)
{ {
struct led_init_data init_data = {}; struct led_init_data init_data = {};
int ret;
if (!np) if (!np)
return 0; return 0;
@ -158,21 +157,14 @@ static int ubnt_ledbar_init_led(struct device_node *np, struct ubnt_ledbar *ledb
led_cdev->max_brightness = UBNT_LEDBAR_MAX_BRIGHTNESS; led_cdev->max_brightness = UBNT_LEDBAR_MAX_BRIGHTNESS;
ret = devm_led_classdev_register_ext(&ledbar->client->dev, led_cdev, return devm_led_classdev_register_ext(&ledbar->client->dev, led_cdev, &init_data);
&init_data);
if (ret)
dev_err(&ledbar->client->dev, "led register err: %d\n", ret);
return ret;
} }
static int ubnt_ledbar_probe(struct i2c_client *client)
static int ubnt_ledbar_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{ {
struct device_node *np = client->dev.of_node; struct device_node *np = client->dev.of_node;
struct ubnt_ledbar *ledbar; struct ubnt_ledbar *ledbar;
int ret; int err;
ledbar = devm_kzalloc(&client->dev, sizeof(*ledbar), GFP_KERNEL); ledbar = devm_kzalloc(&client->dev, sizeof(*ledbar), GFP_KERNEL);
if (!ledbar) if (!ledbar)
@ -180,26 +172,22 @@ static int ubnt_ledbar_probe(struct i2c_client *client,
ledbar->enable_gpio = devm_gpiod_get(&client->dev, "enable", GPIOD_OUT_LOW); ledbar->enable_gpio = devm_gpiod_get(&client->dev, "enable", GPIOD_OUT_LOW);
if (IS_ERR(ledbar->enable_gpio)) { if (IS_ERR(ledbar->enable_gpio))
ret = PTR_ERR(ledbar->enable_gpio); return dev_err_probe(&client->dev, PTR_ERR(ledbar->enable_gpio), "Failed to get enable gpio");
dev_err(&client->dev, "Failed to get enable gpio: %d\n", ret);
return ret;
}
ledbar->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_LOW); ledbar->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(ledbar->reset_gpio)) { if (IS_ERR(ledbar->reset_gpio))
ret = PTR_ERR(ledbar->reset_gpio); return dev_err_probe(&client->dev, PTR_ERR(ledbar->reset_gpio), "Failed to get reset gpio");
dev_err(&client->dev, "Failed to get reset gpio: %d\n", ret);
return ret;
}
ledbar->led_count = 1; ledbar->led_count = 1;
of_property_read_u32(np, "led-count", &ledbar->led_count); of_property_read_u32(np, "led-count", &ledbar->led_count);
ledbar->client = client; ledbar->client = client;
mutex_init(&ledbar->lock); err = devm_mutex_init(&client->dev, &ledbar->lock);
if (err)
return err;
i2c_set_clientdata(client, ledbar); i2c_set_clientdata(client, ledbar);
@ -218,15 +206,6 @@ static int ubnt_ledbar_probe(struct i2c_client *client,
return ubnt_ledbar_apply_state(ledbar); return ubnt_ledbar_apply_state(ledbar);
} }
static int ubnt_ledbar_remove(struct i2c_client *client)
{
struct ubnt_ledbar *ledbar = i2c_get_clientdata(client);
mutex_destroy(&ledbar->lock);
return 0;
}
static const struct i2c_device_id ubnt_ledbar_id[] = { static const struct i2c_device_id ubnt_ledbar_id[] = {
{ "ubnt-ledbar", 0 }, { "ubnt-ledbar", 0 },
{ } { }
@ -245,7 +224,6 @@ static struct i2c_driver ubnt_ledbar_driver = {
.of_match_table = of_ubnt_ledbar_match, .of_match_table = of_ubnt_ledbar_match,
}, },
.probe = ubnt_ledbar_probe, .probe = ubnt_ledbar_probe,
.remove = ubnt_ledbar_remove,
.id_table = ubnt_ledbar_id, .id_table = ubnt_ledbar_id,
}; };
module_i2c_driver(ubnt_ledbar_driver); module_i2c_driver(ubnt_ledbar_driver);