Skip to contentSkip to conversation

usb: phy: remove dead code

PATCH In review Michal Nazarewicz 4 participants 4 messages Nov 10, 2013 – Nov 12, 2013 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: phy: remove dead code

From: Michal Nazarewicz <[email protected]>

---
 drivers/usb/phy/phy-am335x.c  | 2 --
 drivers/usb/phy/phy-generic.c | 2 --
 2 files changed, 4 deletions(-)
drivers/usb/phy/phy-am335x.c +0 -2
index 6370e50..48d41ab 100644
@@ -66,8 +66,6 @@ static int am335x_phy_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, am_phy);
 
 	return 0;
-
-	return ret;
 }
 
 static int am335x_phy_remove(struct platform_device *pdev)
drivers/usb/phy/phy-generic.c +0 -2
index fce3a9e..db4fc22 100644
@@ -271,8 +271,6 @@ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, nop);
 
 	return 0;
-
-	return err;
 }
 
 static int usb_phy_gen_xceiv_remove(struct platform_device *pdev)

--
1.8.3.2

#1 lore raw
Quoted 1 line · Michal Nazarewicz

From: Michal Nazarewicz <[email protected]>

Thanks. This is the result of a merge. Felipe noticed this a few days back and wanted to take care of this, not sure what the exact status is.

Sebastian

#3 lore raw

Commit [4d175f34: usb: phy: nop: Defer clock prepare until PHY init] removed a goto reaching behind a “return ret” at the end of the function thus removing the only possible way that statement could be reached, and so rendering it a dead code. This commit cleans it up by removing said dead code.

---
 drivers/usb/phy/phy-am335x.c  | 2 --
 drivers/usb/phy/phy-generic.c | 2 --
 2 files changed, 4 deletions(-)
Quoted 1 line · Felipe Balbi

no SoB, cannot apply.

Sorry about that.

Quoted 2 lines

I already had this patch in my tree but didn't send it. I'm fine with using yours but I need SoB and commit log.

I don't mind either way as long as the code gets deleted. ;)

drivers/usb/phy/phy-am335x.c +0 -2
index 6370e50..48d41ab 100644
@@ -66,8 +66,6 @@ static int am335x_phy_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, am_phy);
 
 	return 0;
-
-	return ret;
 }
 
 static int am335x_phy_remove(struct platform_device *pdev)
drivers/usb/phy/phy-generic.c +0 -2
index fce3a9e..db4fc22 100644
@@ -271,8 +271,6 @@ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, nop);
 
 	return 0;
-
-	return err;
 }
 
 static int usb_phy_gen_xceiv_remove(struct platform_device *pdev)

--
1.8.3.2