Skip to content

Commit

Permalink
leds: pca963x: cosmetic: use helper variables, better indentation
Browse files Browse the repository at this point in the history 
Use helper variables: instead of writing &client->dev at many places,
write only dev. The same with pca963x->chip->chipdef,
pca963x->chip->client).

Use helper variable u8 val for i2c_smbus_write_byte_data, for better
indentation.

Indent better on various places.

Signed-off-by: Marek Behún <[email protected]>
Cc: Peter Meerwald <[email protected]>
Cc: Ricardo Ribalda <[email protected]>
Cc: Zahari Petkov <[email protected]>
Signed-off-by: Pavel Machek <[email protected]>
  • Loading branch information
@elkablo @pavelmachek
elkablo authored and pavelmachek committed Sep 30, 2020
1 parent a238098 commit 3911849
Showing 1 changed file with 71 additions and 68 deletions.
139 changes: 71 additions & 68 deletions drivers/leds/leds-pca963x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,35 +116,38 @@ struct pca963x_led {
};

static int pca963x_brightness(struct pca963x_led *pca963x,
enum led_brightness brightness)
enum led_brightness brightness)
{
u8 ledout_addr = pca963x->chip->chipdef->ledout_base
+ (pca963x->led_num / 4);
u8 ledout;
int shift = 2 * (pca963x->led_num % 4);
u8 mask = 0x3 << shift;
struct i2c_client *client = pca963x->chip->client;
struct pca963x_chipdef *chipdef = pca963x->chip->chipdef;
u8 ledout_addr, ledout, mask, val;
int shift;
int ret;

ledout = i2c_smbus_read_byte_data(pca963x->chip->client, ledout_addr);
ledout_addr = chipdef->ledout_base + (pca963x->led_num / 4);
shift = 2 * (pca963x->led_num % 4);
mask = 0x3 << shift;
ledout = i2c_smbus_read_byte_data(client, ledout_addr);

switch (brightness) {
case LED_FULL:
ret = i2c_smbus_write_byte_data(pca963x->chip->client,
ledout_addr,
(ledout & ~mask) | (PCA963X_LED_ON << shift));
val = (ledout & ~mask) | (PCA963X_LED_ON << shift);
ret = i2c_smbus_write_byte_data(client, ledout_addr, val);
break;
case LED_OFF:
ret = i2c_smbus_write_byte_data(pca963x->chip->client,
ledout_addr, ledout & ~mask);
val = ledout & ~mask;
ret = i2c_smbus_write_byte_data(client, ledout_addr, val);
break;
default:
ret = i2c_smbus_write_byte_data(pca963x->chip->client,
PCA963X_PWM_BASE + pca963x->led_num,
brightness);
ret = i2c_smbus_write_byte_data(client,
PCA963X_PWM_BASE +
pca963x->led_num,
brightness);
if (ret < 0)
return ret;
ret = i2c_smbus_write_byte_data(pca963x->chip->client,
ledout_addr,
(ledout & ~mask) | (PCA963X_LED_PWM << shift));

val = (ledout & ~mask) | (PCA963X_LED_PWM << shift);
ret = i2c_smbus_write_byte_data(client, ledout_addr, val);
break;
}

Expand All @@ -153,51 +156,55 @@ static int pca963x_brightness(struct pca963x_led *pca963x,

static void pca963x_blink(struct pca963x_led *pca963x)
{
u8 ledout_addr = pca963x->chip->chipdef->ledout_base +
(pca963x->led_num / 4);
u8 ledout;
u8 mode2 = i2c_smbus_read_byte_data(pca963x->chip->client,
PCA963X_MODE2);
int shift = 2 * (pca963x->led_num % 4);
u8 mask = 0x3 << shift;
struct i2c_client *client = pca963x->chip->client;
struct pca963x_chipdef *chipdef = pca963x->chip->chipdef;
u8 ledout_addr, ledout, mask, val, mode2;
int shift;

ledout_addr = chipdef->ledout_base + (pca963x->led_num / 4);
shift = 2 * (pca963x->led_num % 4);
mask = 0x3 << shift;
mode2 = i2c_smbus_read_byte_data(client, PCA963X_MODE2);

i2c_smbus_write_byte_data(pca963x->chip->client,
pca963x->chip->chipdef->grppwm, pca963x->gdc);
i2c_smbus_write_byte_data(client, chipdef->grppwm, pca963x->gdc);

i2c_smbus_write_byte_data(pca963x->chip->client,
pca963x->chip->chipdef->grpfreq, pca963x->gfrq);
i2c_smbus_write_byte_data(client, chipdef->grpfreq, pca963x->gfrq);

if (!(mode2 & PCA963X_MODE2_DMBLNK))
i2c_smbus_write_byte_data(pca963x->chip->client, PCA963X_MODE2,
mode2 | PCA963X_MODE2_DMBLNK);
i2c_smbus_write_byte_data(client, PCA963X_MODE2,
mode2 | PCA963X_MODE2_DMBLNK);

mutex_lock(&pca963x->chip->mutex);
ledout = i2c_smbus_read_byte_data(pca963x->chip->client, ledout_addr);
if ((ledout & mask) != (PCA963X_LED_GRP_PWM << shift))
i2c_smbus_write_byte_data(pca963x->chip->client, ledout_addr,
(ledout & ~mask) | (PCA963X_LED_GRP_PWM << shift));

ledout = i2c_smbus_read_byte_data(client, ledout_addr);
if ((ledout & mask) != (PCA963X_LED_GRP_PWM << shift)) {
val = (ledout & ~mask) | (PCA963X_LED_GRP_PWM << shift);
i2c_smbus_write_byte_data(client, ledout_addr, val);
}

mutex_unlock(&pca963x->chip->mutex);
}

static int pca963x_power_state(struct pca963x_led *pca963x)
{
struct i2c_client *client = pca963x->chip->client;
unsigned long *leds_on = &pca963x->chip->leds_on;
unsigned long cached_leds = pca963x->chip->leds_on;
unsigned long cached_leds = *leds_on;

if (pca963x->led_cdev.brightness)
set_bit(pca963x->led_num, leds_on);
else
clear_bit(pca963x->led_num, leds_on);

if (!(*leds_on) != !cached_leds)
return i2c_smbus_write_byte_data(pca963x->chip->client,
PCA963X_MODE1, *leds_on ? 0 : BIT(4));
return i2c_smbus_write_byte_data(client, PCA963X_MODE1,
*leds_on ? 0 : BIT(4));

return 0;
}

static int pca963x_led_set(struct led_classdev *led_cdev,
enum led_brightness value)
enum led_brightness value)
{
struct pca963x_led *pca963x;
int ret;
Expand All @@ -217,15 +224,15 @@ static int pca963x_led_set(struct led_classdev *led_cdev,
}

static unsigned int pca963x_period_scale(struct pca963x_led *pca963x,
unsigned int val)
unsigned int val)
{
unsigned int scaling = pca963x->chip->chipdef->scaling;

return scaling ? DIV_ROUND_CLOSEST(val * scaling, 1000) : val;
}

static int pca963x_blink_set(struct led_classdev *led_cdev,
unsigned long *delay_on, unsigned long *delay_off)
unsigned long *delay_on, unsigned long *delay_off)
{
struct pca963x_led *pca963x;
unsigned long time_on, time_off, period;
Expand Down Expand Up @@ -278,23 +285,23 @@ static int pca963x_blink_set(struct led_classdev *led_cdev,
}

static struct pca963x_platform_data *
pca963x_get_pdata(struct i2c_client *client, struct pca963x_chipdef *chip)
pca963x_get_pdata(struct device *dev, struct pca963x_chipdef *chip)
{
struct pca963x_platform_data *pdata;
struct led_info *pca963x_leds;
struct fwnode_handle *child;
int count;

count = device_get_child_node_count(&client->dev);
count = device_get_child_node_count(dev);
if (!count || count > chip->n_leds)
return ERR_PTR(-ENODEV);

pca963x_leds = devm_kcalloc(&client->dev,
chip->n_leds, sizeof(struct led_info), GFP_KERNEL);
pca963x_leds = devm_kcalloc(dev, chip->n_leds, sizeof(struct led_info),
GFP_KERNEL);
if (!pca963x_leds)
return ERR_PTR(-ENOMEM);

device_for_each_child_node(&client->dev, child) {
device_for_each_child_node(dev, child) {
struct led_info led = {};
u32 reg;
int res;
Expand All @@ -312,32 +319,32 @@ pca963x_get_pdata(struct i2c_client *client, struct pca963x_chipdef *chip)

pca963x_leds[reg] = led;
}
pdata = devm_kzalloc(&client->dev,
sizeof(struct pca963x_platform_data), GFP_KERNEL);
pdata = devm_kzalloc(dev, sizeof(struct pca963x_platform_data),
GFP_KERNEL);
if (!pdata)
return ERR_PTR(-ENOMEM);

pdata->leds.leds = pca963x_leds;
pdata->leds.num_leds = chip->n_leds;

/* default to open-drain unless totem pole (push-pull) is specified */
if (device_property_read_bool(&client->dev, "nxp,totem-pole"))
if (device_property_read_bool(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 (device_property_read_bool(&client->dev, "nxp,hw-blink"))
if (device_property_read_bool(dev, "nxp,hw-blink"))
pdata->blink_type = PCA963X_HW_BLINK;
else
pdata->blink_type = PCA963X_SW_BLINK;

if (device_property_read_u32(&client->dev, "nxp,period-scale",
if (device_property_read_u32(dev, "nxp,period-scale",
&chip->scaling))
chip->scaling = 1000;

/* default to non-inverted output, unless inverted is specified */
if (device_property_read_bool(&client->dev, "nxp,inverted-out"))
if (device_property_read_bool(dev, "nxp,inverted-out"))
pdata->dir = PCA963X_INVERTED;
else
pdata->dir = PCA963X_NORMAL;
Expand All @@ -355,38 +362,36 @@ static const struct of_device_id of_pca963x_match[] = {
MODULE_DEVICE_TABLE(of, of_pca963x_match);

static int pca963x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
const struct i2c_device_id *id)
{
struct device *dev = &client->dev;
struct pca963x *pca963x_chip;
struct pca963x_led *pca963x;
struct pca963x_platform_data *pdata;
struct pca963x_chipdef *chip;
int i, err;

chip = &pca963x_chipdefs[id->driver_data];
pdata = dev_get_platdata(&client->dev);
pdata = dev_get_platdata(dev);

if (!pdata) {
pdata = pca963x_get_pdata(client, chip);
pdata = pca963x_get_pdata(dev, chip);
if (IS_ERR(pdata)) {
dev_warn(&client->dev, "could not parse configuration\n");
dev_warn(dev, "could not parse configuration\n");
pdata = NULL;
}
}

if (pdata && (pdata->leds.num_leds < 1 ||
pdata->leds.num_leds > chip->n_leds)) {
dev_err(&client->dev, "board info must claim 1-%d LEDs",
chip->n_leds);
pdata->leds.num_leds > chip->n_leds)) {
dev_err(dev, "board info must claim 1-%d LEDs", chip->n_leds);
return -EINVAL;
}

pca963x_chip = devm_kzalloc(&client->dev, sizeof(*pca963x_chip),
GFP_KERNEL);
pca963x_chip = devm_kzalloc(dev, sizeof(*pca963x_chip), GFP_KERNEL);
if (!pca963x_chip)
return -ENOMEM;
pca963x = devm_kcalloc(&client->dev, chip->n_leds, sizeof(*pca963x),
GFP_KERNEL);
pca963x = devm_kcalloc(dev, chip->n_leds, sizeof(*pca963x), GFP_KERNEL);
if (!pca963x)
return -ENOMEM;

Expand Down Expand Up @@ -427,7 +432,7 @@ static int pca963x_probe(struct i2c_client *client,
if (pdata && pdata->blink_type == PCA963X_HW_BLINK)
pca963x[i].led_cdev.blink_set = pca963x_blink_set;

err = led_classdev_register(&client->dev, &pca963x[i].led_cdev);
err = led_classdev_register(dev, &pca963x[i].led_cdev);
if (err < 0)
goto exit;
}
Expand All @@ -436,8 +441,7 @@ static int pca963x_probe(struct i2c_client *client,
i2c_smbus_write_byte_data(client, PCA963X_MODE1, BIT(4));

if (pdata) {
u8 mode2 = i2c_smbus_read_byte_data(pca963x->chip->client,
PCA963X_MODE2);
u8 mode2 = i2c_smbus_read_byte_data(client, PCA963X_MODE2);
/* Configure output: open-drain or totem pole (push-pull) */
if (pdata->outdrv == PCA963X_OPEN_DRAIN)
mode2 &= ~PCA963X_MODE2_OUTDRV;
Expand All @@ -446,8 +450,7 @@ static int pca963x_probe(struct i2c_client *client,
/* Configure direction: normal or inverted */
if (pdata->dir == PCA963X_INVERTED)
mode2 |= PCA963X_MODE2_INVRT;
i2c_smbus_write_byte_data(pca963x->chip->client, PCA963X_MODE2,
mode2);
i2c_smbus_write_byte_data(client, PCA963X_MODE2, mode2);
}

return 0;
Expand Down

0 comments on commit 3911849

Please sign in to comment.