ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

phy: ti: convert to devm_platform_ioremap_resource(_byname)

Browse Source 
Use devm_platform_ioremap_resource(_byname) to simplify code

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1604642930-29019-17-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Chunfeng Yun
2020-11-06 14:08:50 +08:00
committed by Vinod Koul
parent 9ab4212b0a
commit 79caf207d6
3 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/phy/ti/phy-omap-control.c
View File

@@ -268,7 +268,6 @@ MODULE_DEVICE_TABLE(of, omap_control_phy_id_table);
static int omap_control_phy_probe(struct platform_device *pdev) static int omap_control_phy_probe(struct platform_device *pdev)
{ {
struct resource *res;
const struct of_device_id *of_id; const struct of_device_id *of_id;
struct omap_control_phy *control_phy; struct omap_control_phy *control_phy;
@@ -285,16 +284,13 @@ static int omap_control_phy_probe(struct platform_device *pdev)
control_phy->type = *(enum omap_control_phy_type *)of_id->data; control_phy->type = *(enum omap_control_phy_type *)of_id->data;
if (control_phy->type == OMAP_CTRL_TYPE_OTGHS) { if (control_phy->type == OMAP_CTRL_TYPE_OTGHS) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, control_phy->otghs_control =
"otghs_control"); devm_platform_ioremap_resource_byname(pdev, "otghs_control");
control_phy->otghs_control = devm_ioremap_resource(
&pdev->dev, res);
if (IS_ERR(control_phy->otghs_control)) if (IS_ERR(control_phy->otghs_control))
return PTR_ERR(control_phy->otghs_control); return PTR_ERR(control_phy->otghs_control);
} else { } else {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, control_phy->power =
"power"); devm_platform_ioremap_resource_byname(pdev, "power");
control_phy->power = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(control_phy->power)) { if (IS_ERR(control_phy->power)) {
dev_err(&pdev->dev, "Couldn't get power register\n"); dev_err(&pdev->dev, "Couldn't get power register\n");
return PTR_ERR(control_phy->power); return PTR_ERR(control_phy->power);
@@ -312,9 +308,8 @@ static int omap_control_phy_probe(struct platform_device *pdev)
} }
if (control_phy->type == OMAP_CTRL_TYPE_PCIE) { if (control_phy->type == OMAP_CTRL_TYPE_PCIE) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, control_phy->pcie_pcs =
"pcie_pcs"); devm_platform_ioremap_resource_byname(pdev, "pcie_pcs");
control_phy->pcie_pcs = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(control_phy->pcie_pcs)) if (IS_ERR(control_phy->pcie_pcs))
return PTR_ERR(control_phy->pcie_pcs); return PTR_ERR(control_phy->pcie_pcs);
} }

4
drivers/phy/ti/phy-omap-usb2.c
View File

@@ -366,7 +366,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
{ {
struct omap_usb *phy; struct omap_usb *phy;
struct phy *generic_phy; struct phy *generic_phy;
struct resource *res;
struct phy_provider *phy_provider; struct phy_provider *phy_provider;
struct usb_otg *otg; struct usb_otg *otg;
struct device_node *node = pdev->dev.of_node; struct device_node *node = pdev->dev.of_node;
@@ -403,8 +402,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
omap_usb2_init_errata(phy); omap_usb2_init_errata(phy);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); phy->phy_base = devm_platform_ioremap_resource(pdev, 0);
phy->phy_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(phy->phy_base)) if (IS_ERR(phy->phy_base))
return PTR_ERR(phy->phy_base); return PTR_ERR(phy->phy_base);

15
drivers/phy/ti/phy-ti-pipe3.c
View File

@@ -745,35 +745,28 @@ static int ti_pipe3_get_sysctrl(struct ti_pipe3 *phy)
static int ti_pipe3_get_tx_rx_base(struct ti_pipe3 *phy) static int ti_pipe3_get_tx_rx_base(struct ti_pipe3 *phy)
{ {
struct resource *res;
struct device *dev = phy->dev; struct device *dev = phy->dev;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, phy->phy_rx = devm_platform_ioremap_resource_byname(pdev, "phy_rx");
"phy_rx");
phy->phy_rx = devm_ioremap_resource(dev, res);
if (IS_ERR(phy->phy_rx)) if (IS_ERR(phy->phy_rx))
return PTR_ERR(phy->phy_rx); return PTR_ERR(phy->phy_rx);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, phy->phy_tx = devm_platform_ioremap_resource_byname(pdev, "phy_tx");
"phy_tx");
phy->phy_tx = devm_ioremap_resource(dev, res);
return PTR_ERR_OR_ZERO(phy->phy_tx); return PTR_ERR_OR_ZERO(phy->phy_tx);
} }
static int ti_pipe3_get_pll_base(struct ti_pipe3 *phy) static int ti_pipe3_get_pll_base(struct ti_pipe3 *phy)
{ {
struct resource *res;
struct device *dev = phy->dev; struct device *dev = phy->dev;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
if (phy->mode == PIPE3_MODE_PCIE) if (phy->mode == PIPE3_MODE_PCIE)
return 0; return 0;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, phy->pll_ctrl_base =
"pll_ctrl"); devm_platform_ioremap_resource_byname(pdev, "pll_ctrl");
phy->pll_ctrl_base = devm_ioremap_resource(dev, res);
return PTR_ERR_OR_ZERO(phy->pll_ctrl_base); return PTR_ERR_OR_ZERO(phy->pll_ctrl_base);
} }