Skip to contentSkip to conversation

usb: host: tegra: code clean up

PATCH In review Venu Byravarasu 3 participants 5 messages Sep 12, 2012 – Sep 13, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: host: tegra: code clean up

As part of code clean up, used devm counterparts for the APIs possible.

---
 drivers/usb/host/ehci-tegra.c |   46 ++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)
drivers/usb/host/ehci-tegra.c +16 -30
index c0d4732..532db04 100644
@@ -634,7 +634,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 	setup_vbus_gpio(pdev, pdata);
 
-	tegra = kzalloc(sizeof(struct tegra_ehci_hcd), GFP_KERNEL);
+	tegra = devm_kzalloc(&pdev->dev, sizeof(struct tegra_ehci_hcd),
+			     GFP_KERNEL);
 	if (!tegra)
 		return -ENOMEM;
 
@@ -642,13 +643,12 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 					dev_name(&pdev->dev));
 	if (!hcd) {
 		dev_err(&pdev->dev, "Unable to create HCD\n");
-		err = -ENOMEM;
-		goto fail_hcd;
+		return -ENOMEM;
 	}
 
 	platform_set_drvdata(pdev, tegra);
 
-	tegra->clk = clk_get(&pdev->dev, NULL);
+	tegra->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(tegra->clk)) {
 		dev_err(&pdev->dev, "Can't get ehci clock\n");
 		err = PTR_ERR(tegra->clk);
@@ -657,9 +657,9 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 	err = clk_prepare_enable(tegra->clk);
 	if (err)
-		goto fail_clken;
+		goto fail_clk;
 
-	tegra->emc_clk = clk_get(&pdev->dev, "emc");
+	tegra->emc_clk = devm_clk_get(&pdev->dev, "emc");
 	if (IS_ERR(tegra->emc_clk)) {
 		dev_err(&pdev->dev, "Can't get emc clock\n");
 		err = PTR_ERR(tegra->emc_clk);
@@ -677,7 +677,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 	}
 	hcd->rsrc_start = res->start;
 	hcd->rsrc_len = resource_size(res);
-	hcd->regs = ioremap(res->start, resource_size(res));
+	hcd->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
 	if (!hcd->regs) {
 		dev_err(&pdev->dev, "Failed to remap I/O memory\n");
 		err = -ENOMEM;
@@ -701,8 +701,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 			break;
 		default:
 			err = -ENODEV;
-			dev_err(&pdev->dev, "unknown usb instance\n");
-			goto fail_phy;
+			dev_err(&pdev->dev, "unknown usb inst:%d\n", instance);
+			goto fail_io;
 		}
 	}
 
@@ -712,7 +712,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 	if (IS_ERR(tegra->phy)) {
 		dev_err(&pdev->dev, "Failed to open USB phy\n");
 		err = -ENXIO;
-		goto fail_phy;
+		goto fail_io;
 	}
 
 	usb_phy_init(&tegra->phy->u_phy);
@@ -735,7 +735,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_USB_OTG_UTILS
 	if (pdata->operating_mode == TEGRA_USB_OTG) {
-		tegra->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
+		tegra->transceiver =
+			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
 		if (!IS_ERR_OR_NULL(tegra->transceiver))
 			otg_set_host(tegra->transceiver->otg, &hcd->self);
 	}
@@ -743,7 +744,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (err) {
-		dev_err(&pdev->dev, "Failed to add USB HCD\n");
+		dev_err(&pdev->dev, "usb_add_hcd failed with err 0x%x\n", err);
 		goto fail;
 	}
 
@@ -752,32 +753,23 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 	/* Don't skip the pm_runtime_forbid call if wakeup isn't working */
 	/* if (!pdata->power_down_on_bus_suspend) */
-		pm_runtime_forbid(&pdev->dev);
+	pm_runtime_forbid(&pdev->dev);
 	pm_runtime_enable(&pdev->dev);
 	pm_runtime_put_sync(&pdev->dev);
 	return err;
 
 fail:
 #ifdef CONFIG_USB_OTG_UTILS
-	if (!IS_ERR_OR_NULL(tegra->transceiver)) {
+	if (!IS_ERR_OR_NULL(tegra->transceiver))
 		otg_set_host(tegra->transceiver->otg, NULL);
-		usb_put_phy(tegra->transceiver);
-	}
 #endif
 	usb_phy_shutdown(&tegra->phy->u_phy);
-fail_phy:
-	iounmap(hcd->regs);
 fail_io:
 	clk_disable_unprepare(tegra->emc_clk);
-	clk_put(tegra->emc_clk);
 fail_emc_clk:
 	clk_disable_unprepare(tegra->clk);
-fail_clken:
-	clk_put(tegra->clk);
 fail_clk:
 	usb_put_hcd(hcd);
-fail_hcd:
-	kfree(tegra);
 	return err;
 }
 
@@ -794,26 +786,20 @@ static int tegra_ehci_remove(struct platform_device *pdev)
 	pm_runtime_put_noidle(&pdev->dev);
 
 #ifdef CONFIG_USB_OTG_UTILS
-	if (!IS_ERR_OR_NULL(tegra->transceiver)) {
+	if (!IS_ERR_OR_NULL(tegra->transceiver))
 		otg_set_host(tegra->transceiver->otg, NULL);
-		usb_put_phy(tegra->transceiver);
-	}
 #endif
 
 	usb_remove_hcd(hcd);
 
 	usb_phy_shutdown(&tegra->phy->u_phy);
-	iounmap(hcd->regs);
 
 	usb_put_hcd(hcd);
 
 	clk_disable_unprepare(tegra->clk);
-	clk_put(tegra->clk);
 
 	clk_disable_unprepare(tegra->emc_clk);
-	clk_put(tegra->emc_clk);
 
-	kfree(tegra);
 	return 0;
 }
 
Signature · 1 line
1.7.1.1
#1 lore raw

Hi,

Quoted 4 lines · Venu Byravarasu

As part of code clean up, used devm counterparts for the APIs possible.

EHCI is Alan's domain.

Quoted 160 lines
---
 drivers/usb/host/ehci-tegra.c |   46 ++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)
drivers/usb/host/ehci-tegra.c +16 -30
index c0d4732..532db04 100644
@@ -634,7 +634,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 	setup_vbus_gpio(pdev, pdata);
 
-	tegra = kzalloc(sizeof(struct tegra_ehci_hcd), GFP_KERNEL);
+	tegra = devm_kzalloc(&pdev->dev, sizeof(struct tegra_ehci_hcd),
+			     GFP_KERNEL);
 	if (!tegra)
 		return -ENOMEM;
 
@@ -642,13 +643,12 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 					dev_name(&pdev->dev));
 	if (!hcd) {
 		dev_err(&pdev->dev, "Unable to create HCD\n");
-		err = -ENOMEM;
-		goto fail_hcd;
+		return -ENOMEM;
 	}
 
 	platform_set_drvdata(pdev, tegra);
 
-	tegra->clk = clk_get(&pdev->dev, NULL);
+	tegra->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(tegra->clk)) {
 		dev_err(&pdev->dev, "Can't get ehci clock\n");
 		err = PTR_ERR(tegra->clk);
@@ -657,9 +657,9 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 	err = clk_prepare_enable(tegra->clk);
 	if (err)
-		goto fail_clken;
+		goto fail_clk;
 
-	tegra->emc_clk = clk_get(&pdev->dev, "emc");
+	tegra->emc_clk = devm_clk_get(&pdev->dev, "emc");
 	if (IS_ERR(tegra->emc_clk)) {
 		dev_err(&pdev->dev, "Can't get emc clock\n");
 		err = PTR_ERR(tegra->emc_clk);
@@ -677,7 +677,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 	}
 	hcd->rsrc_start = res->start;
 	hcd->rsrc_len = resource_size(res);
-	hcd->regs = ioremap(res->start, resource_size(res));
+	hcd->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
 	if (!hcd->regs) {
 		dev_err(&pdev->dev, "Failed to remap I/O memory\n");
 		err = -ENOMEM;
@@ -701,8 +701,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 			break;
 		default:
 			err = -ENODEV;
-			dev_err(&pdev->dev, "unknown usb instance\n");
-			goto fail_phy;
+			dev_err(&pdev->dev, "unknown usb inst:%d\n", instance);
+			goto fail_io;
 		}
 	}
 
@@ -712,7 +712,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 	if (IS_ERR(tegra->phy)) {
 		dev_err(&pdev->dev, "Failed to open USB phy\n");
 		err = -ENXIO;
-		goto fail_phy;
+		goto fail_io;
 	}
 
 	usb_phy_init(&tegra->phy->u_phy);
@@ -735,7 +735,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_USB_OTG_UTILS
 	if (pdata->operating_mode == TEGRA_USB_OTG) {
-		tegra->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
+		tegra->transceiver =
+			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
 		if (!IS_ERR_OR_NULL(tegra->transceiver))
 			otg_set_host(tegra->transceiver->otg, &hcd->self);
 	}
@@ -743,7 +744,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (err) {
-		dev_err(&pdev->dev, "Failed to add USB HCD\n");
+		dev_err(&pdev->dev, "usb_add_hcd failed with err 0x%x\n", err);
 		goto fail;
 	}
 
@@ -752,32 +753,23 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 	/* Don't skip the pm_runtime_forbid call if wakeup isn't working */
 	/* if (!pdata->power_down_on_bus_suspend) */
-		pm_runtime_forbid(&pdev->dev);
+	pm_runtime_forbid(&pdev->dev);
 	pm_runtime_enable(&pdev->dev);
 	pm_runtime_put_sync(&pdev->dev);
 	return err;
 
 fail:
 #ifdef CONFIG_USB_OTG_UTILS
-	if (!IS_ERR_OR_NULL(tegra->transceiver)) {
+	if (!IS_ERR_OR_NULL(tegra->transceiver))
 		otg_set_host(tegra->transceiver->otg, NULL);
-		usb_put_phy(tegra->transceiver);
-	}
 #endif
 	usb_phy_shutdown(&tegra->phy->u_phy);
-fail_phy:
-	iounmap(hcd->regs);
 fail_io:
 	clk_disable_unprepare(tegra->emc_clk);
-	clk_put(tegra->emc_clk);
 fail_emc_clk:
 	clk_disable_unprepare(tegra->clk);
-fail_clken:
-	clk_put(tegra->clk);
 fail_clk:
 	usb_put_hcd(hcd);
-fail_hcd:
-	kfree(tegra);
 	return err;
 }
 
@@ -794,26 +786,20 @@ static int tegra_ehci_remove(struct platform_device *pdev)
 	pm_runtime_put_noidle(&pdev->dev);
 
 #ifdef CONFIG_USB_OTG_UTILS
-	if (!IS_ERR_OR_NULL(tegra->transceiver)) {
+	if (!IS_ERR_OR_NULL(tegra->transceiver))
 		otg_set_host(tegra->transceiver->otg, NULL);
-		usb_put_phy(tegra->transceiver);
-	}
 #endif
 
 	usb_remove_hcd(hcd);
 
 	usb_phy_shutdown(&tegra->phy->u_phy);
-	iounmap(hcd->regs);
 
 	usb_put_hcd(hcd);
 
 	clk_disable_unprepare(tegra->clk);
-	clk_put(tegra->clk);
 
 	clk_disable_unprepare(tegra->emc_clk);
-	clk_put(tegra->emc_clk);
 
-	kfree(tegra);
 	return 0;
 }
 
Signature · 1 line
1.7.1.1
Signature · 1 line
balbi
#2 lore raw
In reply to Venu Byravarasu
Quoted 2 lines · Venu Byravarasu

As part of code clean up, used devm counterparts for the APIs possible.

Almost all of this patch has already been applied as:

bc2ff98 drivers/usb/host/ehci-tegra.c: use devm_ functions

(btw, that patch has a much better patch subject than this one)

The only additions in your patch are shown below, and those changes should indeed be a separate patch.

Quoted 23 lines
drivers/usb/host/ehci-tegra.c +2 -2
index 6223d17..dba9f07 100644
@@ -701,7 +701,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                        break;
                default:
                        err = -ENODEV;
-                       dev_err(&pdev->dev, "unknown usb instance\n");
+                       dev_err(&pdev->dev, "unknown usb inst:%d\n", instance);
                        goto fail_io;
                }
        }
@@ -744,7 +744,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
        err = usb_add_hcd(hcd, irq, IRQF_SHARED);
        if (err) {
-               dev_err(&pdev->dev, "Failed to add USB HCD\n");
+               dev_err(&pdev->dev, "usb_add_hcd failed with err 0x%x\n", err);
                goto fail;
        }
 

drivers/usb/host/ehci-tegra.c static int tegra_ehci_probe(struct platform_device *pdev) · line 759

Quoted 8 lines
drivers/usb/host/ehci-tegra.c +1 -1
@@ -753,7 +753,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
        /* Don't skip the pm_runtime_forbid call if wakeup isn't working */
        /* if (!pdata->power_down_on_bus_suspend) */
-               pm_runtime_forbid(&pdev->dev);
+       pm_runtime_forbid(&pdev->dev);
        pm_runtime_enable(&pdev->dev);
        pm_runtime_put_sync(&pdev->dev);
        return err;

I'm not sure that last change is worth making; hopefully, you'll fix the bug the causes the "if" to be commented out, and we can re-enabled it again. Removing the indent makes it much less obvious which lines of code the "if" was intended to cover.

#3 lore raw
Quoted 7 lines

-----Original Message-----
From: Stephen Warren [mailto:[email protected]]
Sent: Wednesday, September 12, 2012 11:41 PM
To: Venu Byravarasu
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] usb: host: tegra: code clean up

Quoted 5 lines
Quoted 2 lines · Venu Byravarasu

As part of code clean up, used devm counterparts for the APIs possible.

Almost all of this patch has already been applied as:

Agree.
Currently Balbi's tree has bit old ehci-tegra.c.
Because of this the patches prepared with linux-next need to be rebased onto this tree and prepare a new patch.
My main intention behind pushing this patch was to get all changes of ehci-tegra.c from linux-next into balbi's code base so that I can push the same patch against either balbi's tree or linux-next.

Quoted 46 lines

bc2ff98 drivers/usb/host/ehci-tegra.c: use devm_ functions

(btw, that patch has a much better patch subject than this one)

The only additions in your patch are shown below, and those changes should indeed be a separate patch.

drivers/usb/host/ehci-tegra.c static int tegra_ehci_probe(struct platform_device

Quoted 5 lines
drivers/usb/host/ehci-tegra.c +0 -0
index 6223d17..dba9f07 100644
@@ -701,7 +701,7 @@ static int tegra_ehci_probe(struct platform_device

*pdev)

drivers/usb/host/ehci-tegra.c static int tegra_ehci_probe(struct platform_device

Quoted 9 lines
drivers/usb/host/ehci-tegra.c +1 -1
                        break;
                default:
                        err = -ENODEV;
-                       dev_err(&pdev->dev, "unknown usb instance\n");
+                       dev_err(&pdev->dev, "unknown usb inst:%d\n", instance);
                        goto fail_io;
                }
        }
@@ -744,7 +744,7 @@ static int tegra_ehci_probe(struct platform_device

*pdev)

drivers/usb/host/ehci-tegra.c static int tegra_ehci_probe(struct platform_device

Quoted 9 lines
drivers/usb/host/ehci-tegra.c +1 -1
        err = usb_add_hcd(hcd, irq, IRQF_SHARED);
        if (err) {
-               dev_err(&pdev->dev, "Failed to add USB HCD\n");
+               dev_err(&pdev->dev, "usb_add_hcd failed with err 0x%x\n", err);
                goto fail;
        }
 
@@ -753,7 +753,7 @@ static int tegra_ehci_probe(struct platform_device

*pdev)

drivers/usb/host/ehci-tegra.c static int tegra_ehci_probe(struct platform_device *pdev) · line 759

Quoted 8 lines
drivers/usb/host/ehci-tegra.c +1 -1
        /* Don't skip the pm_runtime_forbid call if wakeup isn't working */
        /* if (!pdata->power_down_on_bus_suspend) */
-               pm_runtime_forbid(&pdev->dev);
+       pm_runtime_forbid(&pdev->dev);
        pm_runtime_enable(&pdev->dev);
        pm_runtime_put_sync(&pdev->dev);
        return err;

I'm not sure that last change is worth making; hopefully, you'll fix the bug the causes the "if" to be commented out, and we can re-enabled it again. Removing the indent makes it much less obvious which lines of code the "if" was intended to cover.

#4 lore raw
Quoted 9 lines · Venu Byravarasu

Stephen Warren wrote at Wednesday, September 12, 2012 11:41 PM:

Quoted 5 lines · Venu Byravarasu
Quoted 2 lines

As part of code clean up, used devm counterparts for the APIs possible.

Almost all of this patch has already been applied as:

Agree.
Currently Balbi's tree has bit old ehci-tegra.c.

Quite possibly. That would happen if patches to ehci-tegra.c were checked into other branches, which have not yet been merged to Linus's tree, and hence have not made it into the baseline for Felipe's tree. This is especially likely as ehci-tegra.c isn't something that Felipe's xceiv branch would usually take patches for IIRC.

Quoted 2 lines

Because of this the patches prepared with linux-next need to be rebased onto this tree and prepare a new patch.
My main intention behind pushing this patch was to get all changes of ehci-tegra.c from linux-next into balbi's code base so that I can push the same patch against either balbi's tree or linux-next.

That's not the way the Linux branching model works. The primary way for Felipe's branch to pick up changes from another branch is for the other branch to be merged by Linus, and then Felipe to either merge Linus's branch into his, or start a new branch based on a more recent tag from Linus's tree. If you send patches to Felipe that duplicate work that's already happened in another branch, you'll most likely end up causing merge conflicts when Felipe's branch is merged with the other branch containing the same work in linux-next, Greg's USB tree, and Linus's tree. Of course, you might get lucky and avoid conflicts if the patches are identical, but duplicate patches are still not a good idea.

It's best if you send patches that apply and operate correctly on one particular branch, e.g. just Felipe's or some other USB (sub-)maintainer's branch.

If your patches actually rely on changes from multiple different branches, then that is problematic. The simplest answer is to simply wait for the (end of the) next kernel merge window when everything has been merged together, and then start sending patches based on the merged result.

In some cases, branches can be merged together other than by Linus, although you do have to be quite careful to avoid pain when doing this. It's best to plan out what patches you'll send, where you expect they will be applied, and point out any such dependencies to the maintainers ahead of time. Developing all your big patches first and then sending them, rather than developing them piecemeal, may help you plan this out better, at least at first.