Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6d8b774 authored by Anda-Maria Nicolae's avatar Anda-Maria Nicolae Committed by Sebastian Reichel
Browse files

power_supply: bq2415x_charger: Fix coding style issues 



This patch fixes the following issues reported by checkpatch.pl:
- use -EINVAL instead of -ENOSYS, to fix warning message:
  "ENOSYS means 'invalid syscall nr' and nothing else"
- remove unnecessary log message
- split lines whose length is greater than 80 characters
- if an arm statement uses braces, add braces to the other arms of the
  respective statement, too
- match alignment with open parenthesis

Signed-off-by: default avatarAnda-Maria Nicolae <anda-maria.nicolae@intel.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 32366720

drivers/power/bq2415x_charger.c

+18 −17
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static int bq2415x_set_charge_current(struct bq2415x_device *bq, int mA) 
	int val;



	if (bq->init_data.resistor_sense <= 0)

		return -ENOSYS;

		return -EINVAL;



	val = (mA * bq->init_data.resistor_sense - 37400) / 6800;

	if (val < 0)
@@ -650,7 +650,7 @@ static int bq2415x_get_charge_current(struct bq2415x_device *bq) 
	int ret;



	if (bq->init_data.resistor_sense <= 0)

		return -ENOSYS;

		return -EINVAL;



	ret = bq2415x_i2c_read_mask(bq, BQ2415X_REG_CURRENT,

			BQ2415X_MASK_VI_CHRG, BQ2415X_SHIFT_VI_CHRG);
@@ -665,7 +665,7 @@ static int bq2415x_set_termination_current(struct bq2415x_device *bq, int mA) 
	int val;



	if (bq->init_data.resistor_sense <= 0)

		return -ENOSYS;

		return -EINVAL;



	val = (mA * bq->init_data.resistor_sense - 3400) / 3400;

	if (val < 0)
@@ -684,7 +684,7 @@ static int bq2415x_get_termination_current(struct bq2415x_device *bq) 
	int ret;



	if (bq->init_data.resistor_sense <= 0)

		return -ENOSYS;

		return -EINVAL;



	ret = bq2415x_i2c_read_mask(bq, BQ2415X_REG_CURRENT,

			BQ2415X_MASK_VI_TERM, BQ2415X_SHIFT_VI_TERM);
@@ -1166,7 +1166,7 @@ static ssize_t bq2415x_sysfs_set_mode(struct device *dev, 


	if (strncmp(buf, "auto", 4) == 0) {

		if (bq->automode < 0)

			return -ENOSYS;

			return -EINVAL;

		bq->automode = 1;

		mode = bq->reported_mode;

	} else if (strncmp(buf, "off", 3) == 0) {
@@ -1556,13 +1556,13 @@ static int bq2415x_probe(struct i2c_client *client, 


	bq = devm_kzalloc(&client->dev, sizeof(*bq), GFP_KERNEL);

	if (!bq) {

		dev_err(&client->dev, "failed to allocate device data\n");

		ret = -ENOMEM;

		goto error_2;

	}



	if (np) {

		bq->notify_psy = power_supply_get_by_phandle(np, "ti,usb-charger-detection");

		bq->notify_psy = power_supply_get_by_phandle(np,

						"ti,usb-charger-detection");



		if (IS_ERR(bq->notify_psy)) {

			dev_info(&client->dev,
@@ -1573,11 +1573,11 @@ static int bq2415x_probe(struct i2c_client *client, 
			ret = -EPROBE_DEFER;

			goto error_2;

		}

	}

	else if (pdata->notify_device)

	} else if (pdata->notify_device) {

		bq->notify_psy = power_supply_get_by_name(pdata->notify_device);

	else

	} else {

		bq->notify_psy = NULL;

	}



	i2c_set_clientdata(client, bq);
@@ -1648,7 +1648,8 @@ static int bq2415x_probe(struct i2c_client *client, 
		}



		/* Query for initial reported_mode and set it */

		bq2415x_notifier_call(&bq->nb, PSY_EVENT_PROP_CHANGED, bq->notify_psy);

		bq2415x_notifier_call(&bq->nb, PSY_EVENT_PROP_CHANGED,

				      bq->notify_psy);

		bq2415x_set_mode(bq, bq->reported_mode);



		bq->automode = 1;