Commit 5f508d79 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci-mtk: Simplify supplies handling with regulator_bulk 



Remove the custom functions xhci_mtk_ldos_{enable,disable}() by
switching to using regulator_bulk to perform the very same thing,
as the regulators are always either both enabled or both disabled.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220214111905.77903-1-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9902951f

drivers/usb/host/xhci-mtk.c

+11 −33
Original line number Diff line number Diff line
@@ -401,29 +401,14 @@ static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk) 
	return devm_clk_bulk_get_optional(mtk->dev, BULK_CLKS_NUM, clks);

}



static int xhci_mtk_ldos_enable(struct xhci_hcd_mtk *mtk)

static int xhci_mtk_vregs_get(struct xhci_hcd_mtk *mtk)

{

	int ret;

	struct regulator_bulk_data *supplies = mtk->supplies;



	ret = regulator_enable(mtk->vbus);

	if (ret) {

		dev_err(mtk->dev, "failed to enable vbus\n");

		return ret;

	}



	ret = regulator_enable(mtk->vusb33);

	if (ret) {

		dev_err(mtk->dev, "failed to enable vusb33\n");

		regulator_disable(mtk->vbus);

		return ret;

	}

	return 0;

}

	supplies[0].supply = "vbus";

	supplies[1].supply = "vusb33";



static void xhci_mtk_ldos_disable(struct xhci_hcd_mtk *mtk)

{

	regulator_disable(mtk->vbus);

	regulator_disable(mtk->vusb33);

	return devm_regulator_bulk_get(mtk->dev, BULK_VREGS_NUM, supplies);

}



static void xhci_mtk_quirks(struct device *dev, struct xhci_hcd *xhci)
@@ -513,17 +498,10 @@ static int xhci_mtk_probe(struct platform_device *pdev) 
		return -ENOMEM;



	mtk->dev = dev;

	mtk->vbus = devm_regulator_get(dev, "vbus");

	if (IS_ERR(mtk->vbus)) {

		dev_err(dev, "fail to get vbus\n");

		return PTR_ERR(mtk->vbus);

	}



	mtk->vusb33 = devm_regulator_get(dev, "vusb33");

	if (IS_ERR(mtk->vusb33)) {

		dev_err(dev, "fail to get vusb33\n");

		return PTR_ERR(mtk->vusb33);

	}

	ret = xhci_mtk_vregs_get(mtk);

	if (ret)

		return dev_err_probe(dev, ret, "Failed to get regulators\n");



	ret = xhci_mtk_clks_get(mtk);

	if (ret)
@@ -564,7 +542,7 @@ static int xhci_mtk_probe(struct platform_device *pdev) 
	pm_runtime_enable(dev);

	pm_runtime_get_sync(dev);



	ret = xhci_mtk_ldos_enable(mtk);

	ret = regulator_bulk_enable(BULK_VREGS_NUM, mtk->supplies);

	if (ret)

		goto disable_pm;
@@ -673,7 +651,7 @@ static int xhci_mtk_probe(struct platform_device *pdev) 
	clk_bulk_disable_unprepare(BULK_CLKS_NUM, mtk->clks);



disable_ldos:

	xhci_mtk_ldos_disable(mtk);

	regulator_bulk_disable(BULK_VREGS_NUM, mtk->supplies);



disable_pm:

	pm_runtime_put_noidle(dev);
@@ -701,7 +679,7 @@ static int xhci_mtk_remove(struct platform_device *pdev) 
	usb_put_hcd(hcd);

	xhci_mtk_sch_exit(mtk);

	clk_bulk_disable_unprepare(BULK_CLKS_NUM, mtk->clks);

	xhci_mtk_ldos_disable(mtk);

	regulator_bulk_disable(BULK_VREGS_NUM, mtk->supplies);



	pm_runtime_disable(dev);

	pm_runtime_put_noidle(dev);

drivers/usb/host/xhci-mtk.h

+3 −2
Original line number Diff line number Diff line
@@ -11,10 +11,12 @@ 


#include <linux/clk.h>

#include <linux/hashtable.h>

#include <linux/regulator/consumer.h>



#include "xhci.h"



#define BULK_CLKS_NUM	5

#define BULK_VREGS_NUM	2



/* support at most 64 ep, use 32 size hash table */

#define SCH_EP_HASH_BITS	5
@@ -150,9 +152,8 @@ struct xhci_hcd_mtk { 
	int num_u3_ports;

	int u2p_dis_msk;

	int u3p_dis_msk;

	struct regulator *vusb33;

	struct regulator *vbus;

	struct clk_bulk_data clks[BULK_CLKS_NUM];

	struct regulator_bulk_data supplies[BULK_VREGS_NUM];

	unsigned int has_ippc:1;

	unsigned int lpm_support:1;

	unsigned int u2_lpm_disable:1;