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

Commit d5c2b14c authored by Kim, Milo's avatar Kim, Milo Committed by Anton Vorontsov
Browse files

lp8788-charger: Fix a parent device in kernel messages 



Use 'platform_device' in kernel messages rather than i2c client device
node. lp8788_update_charger_params() needs additional argument, 'pdev'.
Then, remove unnecessary lp8788 private data in lp8788_irq_register().

Signed-off-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
parent 05ac539b

drivers/power/lp8788-charger.c

+6 −6
Original line number Diff line number Diff line
@@ -367,7 +367,8 @@ static inline bool lp8788_is_valid_charger_register(u8 addr) 
	return addr >= LP8788_CHG_START && addr <= LP8788_CHG_END;

}



static int lp8788_update_charger_params(struct lp8788_charger *pchg)

static int lp8788_update_charger_params(struct platform_device *pdev,

					struct lp8788_charger *pchg)

{

	struct lp8788 *lp = pchg->lp;

	struct lp8788_charger_platform_data *pdata = pchg->pdata;
@@ -376,7 +377,7 @@ static int lp8788_update_charger_params(struct lp8788_charger *pchg) 
	int ret;



	if (!pdata || !pdata->chg_params) {

		dev_info(lp->dev, "skip updating charger parameters\n");

		dev_info(&pdev->dev, "skip updating charger parameters\n");

		return 0;

	}
@@ -537,7 +538,6 @@ static int lp8788_set_irqs(struct platform_device *pdev, 
static int lp8788_irq_register(struct platform_device *pdev,

				struct lp8788_charger *pchg)

{

	struct lp8788 *lp = pchg->lp;

	const char *name[] = {

		LP8788_CHG_IRQ, LP8788_PRSW_IRQ, LP8788_BATT_IRQ

	};
@@ -550,13 +550,13 @@ static int lp8788_irq_register(struct platform_device *pdev, 
	for (i = 0; i < ARRAY_SIZE(name); i++) {

		ret = lp8788_set_irqs(pdev, pchg, name[i]);

		if (ret) {

			dev_warn(lp->dev, "irq setup failed: %s\n", name[i]);

			dev_warn(&pdev->dev, "irq setup failed: %s\n", name[i]);

			return ret;

		}

	}



	if (pchg->num_irqs > LP8788_MAX_CHG_IRQS) {

		dev_err(lp->dev, "invalid total number of irqs: %d\n",

		dev_err(&pdev->dev, "invalid total number of irqs: %d\n",

			pchg->num_irqs);

		return -EINVAL;

	}
@@ -701,7 +701,7 @@ static int lp8788_charger_probe(struct platform_device *pdev) 
	pchg->pdata = lp->pdata ? lp->pdata->chg_pdata : NULL;

	platform_set_drvdata(pdev, pchg);



	ret = lp8788_update_charger_params(pchg);

	ret = lp8788_update_charger_params(pdev, pchg);

	if (ret)

		return ret;