ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-29 10:08:59 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

kernel: leds-gca230718: use shorter priv variable

Browse Source 
Shorter and more consistent with other drivers.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16869
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2024-10-06 17:02:27 -07:00 committed by Hauke Mehrtens
parent 980fe90711
commit 8a1c48301f
1 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
package/kernel/leds-gca230718/src/leds-gca230718.c
View File

@ -47,9 +47,8 @@ static void gca230718_init_private_led_data(struct gca230718_private *data)
} }
} }
static void static void gca230718_send_sequence(struct i2c_client *client, u8 byte0,
gca230718_send_sequence(struct i2c_client *client, u8 byte0, struct gca230718_private *priv)
struct gca230718_private *gca230718_privateData)
{ {
int status = 0; int status = 0;
u8 ledIndex; u8 ledIndex;
@ -69,13 +68,11 @@ gca230718_send_sequence(struct i2c_client *client, u8 byte0,
controlCommand[12] = 0x87; controlCommand[12] = 0x87;
for (ledIndex = 0; ledIndex < GCA230718_MAX_LEDS; ledIndex++) { for (ledIndex = 0; ledIndex < GCA230718_MAX_LEDS; ledIndex++) {
controlCommand[3 + ledIndex] = controlCommand[3 + ledIndex] = priv->leds[ledIndex].brightness;
gca230718_privateData->leds[ledIndex].brightness; controlCommand[8 + ledIndex] = priv->leds[ledIndex].brightness;
controlCommand[8 + ledIndex] =
gca230718_privateData->leds[ledIndex].brightness;
} }
mutex_lock(&(gca230718_privateData->lock)); mutex_lock(&(priv->lock));
if ((status = i2c_smbus_write_i2c_block_data( if ((status = i2c_smbus_write_i2c_block_data(
client, resetCommandRegister, sizeof(resetCommand), client, resetCommandRegister, sizeof(resetCommand),
@ -89,7 +86,7 @@ gca230718_send_sequence(struct i2c_client *client, u8 byte0,
status); status);
} }
mutex_unlock(&(gca230718_privateData->lock)); mutex_unlock(&(priv->lock));
} }
static int gca230718_set_brightness(struct led_classdev *led_cdev, static int gca230718_set_brightness(struct led_classdev *led_cdev,
@ -101,14 +98,14 @@ static int gca230718_set_brightness(struct led_classdev *led_cdev,
led = container_of(led_cdev, struct gca230718_led, ledClassDev); led = container_of(led_cdev, struct gca230718_led, ledClassDev);
client = led->client; client = led->client;
if (client != NULL) { if (client) {
struct gca230718_private *gca230718_privateData; struct gca230718_private *priv;
led->brightness = value; led->brightness = value;
gca230718_privateData = i2c_get_clientdata(client); priv = i2c_get_clientdata(client);
gca230718_send_sequence(client, GCA230718_2ND_SEQUENCE_BYTE_1, gca230718_send_sequence(client, GCA230718_2ND_SEQUENCE_BYTE_1,
gca230718_privateData); priv);
} }
return 0; return 0;
@ -116,20 +113,19 @@ static int gca230718_set_brightness(struct led_classdev *led_cdev,
static int gca230718_probe(struct i2c_client *client) static int gca230718_probe(struct i2c_client *client)
{ {
struct gca230718_private *gca230718_privateData; struct gca230718_private *priv;
pr_info("Enter gca230718_probe for device address %u\n", client->addr); pr_info("Enter gca230718_probe for device address %u\n", client->addr);
gca230718_privateData = devm_kzalloc( priv = devm_kzalloc(&client->dev, sizeof(struct gca230718_private),
&client->dev, sizeof(struct gca230718_private), GFP_KERNEL); GFP_KERNEL);
if (!priv) {
if (!gca230718_privateData) {
pr_info("Error during allocating memory for private data\n"); pr_info("Error during allocating memory for private data\n");
return -ENOMEM; return -ENOMEM;
} }
struct device_node *ledNode; struct device_node *ledNode;
mutex_init(&gca230718_privateData->lock); mutex_init(&priv->lock);
gca230718_init_private_led_data(gca230718_privateData); gca230718_init_private_led_data(priv);
i2c_set_clientdata(client, gca230718_privateData); i2c_set_clientdata(client, priv);
for_each_child_of_node(client->dev.of_node, ledNode) { for_each_child_of_node(client->dev.of_node, ledNode) {
u32 regValue = 0; u32 regValue = 0;
@ -141,11 +137,10 @@ static int gca230718_probe(struct i2c_client *client)
ledNode->name, regValue); ledNode->name, regValue);
else { else {
struct led_classdev *ledClassDev = struct led_classdev *ledClassDev =
&(gca230718_privateData->leds[regValue] &(priv->leds[regValue].ledClassDev);
.ledClassDev);
struct led_init_data init_data = {}; struct led_init_data init_data = {};
gca230718_privateData->leds[regValue].client = client; priv->leds[regValue].client = client;
init_data.fwnode = of_fwnode_handle(ledNode); init_data.fwnode = of_fwnode_handle(ledNode);
pr_info("Creating LED for node %s: reg=%u\n", pr_info("Creating LED for node %s: reg=%u\n",
@ -171,22 +166,19 @@ static int gca230718_probe(struct i2c_client *client)
Send full initialization sequence. Send full initialization sequence.
Afterwards only GCA230718_2ND_SEQUENCE_BYTE_1 must be send to upddate the brightness values. Afterwards only GCA230718_2ND_SEQUENCE_BYTE_1 must be send to upddate the brightness values.
*/ */
gca230718_send_sequence(client, GCA230718_1ST_SEQUENCE_BYTE_1, gca230718_send_sequence(client, GCA230718_1ST_SEQUENCE_BYTE_1, priv);
gca230718_privateData); gca230718_send_sequence(client, GCA230718_2ND_SEQUENCE_BYTE_1, priv);
gca230718_send_sequence(client, GCA230718_2ND_SEQUENCE_BYTE_1, gca230718_send_sequence(client, GCA230718_3RD_SEQUENCE_BYTE_1, priv);
gca230718_privateData);
gca230718_send_sequence(client, GCA230718_3RD_SEQUENCE_BYTE_1,
gca230718_privateData);
return 0; return 0;
} }
static void gca230718_remove(struct i2c_client *client) static void gca230718_remove(struct i2c_client *client)
{ {
struct gca230718_private *gca230718_privateData; struct gca230718_private *priv;
gca230718_privateData = i2c_get_clientdata(client); priv = i2c_get_clientdata(client);
mutex_destroy(&gca230718_privateData->lock); mutex_destroy(&priv->lock);
gca230718_init_private_led_data(gca230718_privateData); gca230718_init_private_led_data(priv);
} }
static const struct i2c_device_id gca230718_i2c_ids[] = { static const struct i2c_device_id gca230718_i2c_ids[] = {