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

Commit f27a5fb4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/optional' into regulator-next

parents 6979380d 9efdd276

drivers/cpufreq/cpufreq-cpu0.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) 
	cpu_dev = &pdev->dev;

	cpu_dev->of_node = np;



	cpu_reg = devm_regulator_get(cpu_dev, "cpu0");

	cpu_reg = devm_regulator_get_optional(cpu_dev, "cpu0");

	if (IS_ERR(cpu_reg)) {

		/*

		 * If cpu0 regulator supply node is present, but regulator is

drivers/hwmon/sht15.c

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static int sht15_probe(struct platform_device *pdev) 
	 * If a regulator is available,

	 * query what the supply voltage actually is!

	 */

	data->reg = devm_regulator_get(data->dev, "vcc");

	data->reg = devm_regulator_get_optional(data->dev, "vcc");

	if (!IS_ERR(data->reg)) {

		int voltage;

drivers/mmc/core/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ int mmc_regulator_get_supply(struct mmc_host *mmc) 


	supply = devm_regulator_get(dev, "vmmc");

	mmc->supply.vmmc = supply;

	mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");

	mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc");



	if (IS_ERR(supply))

		return PTR_ERR(supply);

drivers/mmc/host/dw_mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -2231,7 +2231,7 @@ int dw_mci_probe(struct dw_mci *host) 
		}

	}



	host->vmmc = devm_regulator_get(host->dev, "vmmc");

	host->vmmc = devm_regulator_get_optional(host->dev, "vmmc");

	if (IS_ERR(host->vmmc)) {

		ret = PTR_ERR(host->vmmc);

		if (ret == -EPROBE_DEFER)

drivers/mmc/host/pxamci.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ struct pxamci_host { 
static inline void pxamci_init_ocr(struct pxamci_host *host)

{

#ifdef CONFIG_REGULATOR

	host->vcc = regulator_get(mmc_dev(host->mmc), "vmmc");

	host->vcc = regulator_get_optional(mmc_dev(host->mmc), "vmmc");



	if (IS_ERR(host->vcc))

		host->vcc = NULL;