Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: bd718x7: Stop using parent data

The ROHM PMIC regulator drivers only need the regmap pointer from
the parent device. Regmap can be obtained via dev_get_regmap()
so do not require parent to populate driver data for that.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Link: https://lore.kernel.org/r/20210107122355.GA35080@localhost.localdomain
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Matti Vaittinen and committed by
Mark Brown
907dfdc9 f45c522c

+9 -11
+9 -11
drivers/regulator/bd718x7-regulator.c
··· 1554 1554 1555 1555 static int bd718xx_probe(struct platform_device *pdev) 1556 1556 { 1557 - struct bd718xx *mfd; 1557 + struct regmap *regmap; 1558 1558 struct regulator_config config = { 0 }; 1559 1559 int i, j, err, omit_enable; 1560 1560 bool use_snvs; ··· 1563 1563 enum rohm_chip_type chip = platform_get_device_id(pdev)->driver_data; 1564 1564 const struct regulator_ops **swops, **hwops; 1565 1565 1566 - mfd = dev_get_drvdata(pdev->dev.parent); 1567 - if (!mfd) { 1566 + regmap = dev_get_regmap(pdev->dev.parent, NULL); 1567 + if (!regmap) { 1568 1568 dev_err(&pdev->dev, "No MFD driver data\n"); 1569 - err = -EINVAL; 1570 - goto err; 1569 + return -EINVAL; 1571 1570 } 1572 1571 1573 1572 switch (chip) { ··· 1589 1590 } 1590 1591 1591 1592 /* Register LOCK release */ 1592 - err = regmap_update_bits(mfd->chip.regmap, BD718XX_REG_REGLOCK, 1593 + err = regmap_update_bits(regmap, BD718XX_REG_REGLOCK, 1593 1594 (REGLOCK_PWRSEQ | REGLOCK_VREG), 0); 1594 1595 if (err) { 1595 1596 dev_err(&pdev->dev, "Failed to unlock PMIC (%d)\n", err); ··· 1608 1609 * bit allowing HW defaults for power rails to be used 1609 1610 */ 1610 1611 if (!use_snvs) { 1611 - err = regmap_update_bits(mfd->chip.regmap, 1612 - BD718XX_REG_TRANS_COND1, 1612 + err = regmap_update_bits(regmap, BD718XX_REG_TRANS_COND1, 1613 1613 BD718XX_ON_REQ_POWEROFF_MASK | 1614 1614 BD718XX_SWRESET_POWEROFF_MASK | 1615 1615 BD718XX_WDOG_POWEROFF_MASK | ··· 1624 1626 } 1625 1627 1626 1628 config.dev = pdev->dev.parent; 1627 - config.regmap = mfd->chip.regmap; 1629 + config.regmap = regmap; 1628 1630 /* 1629 1631 * There are cases when we want to leave the enable-control for 1630 1632 * the HW state machine and use this driver only for voltage control. ··· 1683 1685 if (!no_enable_control && (!use_snvs || 1684 1686 !rdev->constraints->always_on || 1685 1687 !rdev->constraints->boot_on)) { 1686 - err = regmap_update_bits(mfd->chip.regmap, r->init.reg, 1688 + err = regmap_update_bits(regmap, r->init.reg, 1687 1689 r->init.mask, r->init.val); 1688 1690 if (err) { 1689 1691 dev_err(&pdev->dev, ··· 1693 1695 } 1694 1696 } 1695 1697 for (j = 0; j < r->additional_init_amnt; j++) { 1696 - err = regmap_update_bits(mfd->chip.regmap, 1698 + err = regmap_update_bits(regmap, 1697 1699 r->additional_inits[j].reg, 1698 1700 r->additional_inits[j].mask, 1699 1701 r->additional_inits[j].val);