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

Commit 2f36ff69 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: phy: generic: allow multiples calls to usb_phy_generic_register() 



it's now very easy to return a platform_device pointer
and have the caller pass it as argument when calling
usb_phy_generic_unregister().

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e741e637

drivers/usb/musb/am35x.c

+9 −3
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
struct am35x_glue {

	struct device		*dev;

	struct platform_device	*musb;

	struct platform_device	*phy;

	struct clk		*phy_clk;

	struct clk		*clk;

};
@@ -503,7 +504,9 @@ static int am35x_probe(struct platform_device *pdev) 


	pdata->platform_ops		= &am35x_ops;



	usb_phy_generic_register();

	glue->phy = usb_phy_generic_register();

	if (IS_ERR(glue->phy))

		goto err7;

	platform_set_drvdata(pdev, glue);



	pinfo = am35x_dev_info;
@@ -517,11 +520,14 @@ static int am35x_probe(struct platform_device *pdev) 
	if (IS_ERR(musb)) {

		ret = PTR_ERR(musb);

		dev_err(&pdev->dev, "failed to register musb device: %d\n", ret);

		goto err7;

		goto err8;

	}



	return 0;



err8:

	usb_phy_generic_unregister(glue->phy);



err7:

	clk_disable(clk);
@@ -546,7 +552,7 @@ static int am35x_remove(struct platform_device *pdev) 
	struct am35x_glue	*glue = platform_get_drvdata(pdev);



	platform_device_unregister(glue->musb);

	usb_phy_generic_unregister();

	usb_phy_generic_unregister(glue->phy);

	clk_disable(glue->clk);

	clk_disable(glue->phy_clk);

	clk_put(glue->clk);

drivers/usb/musb/blackfin.c

+8 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
struct bfin_glue {

	struct device		*dev;

	struct platform_device	*musb;

	struct platform_device	*phy;

};

#define glue_to_musb(g)		platform_get_drvdata(g->musb)
@@ -475,7 +476,9 @@ static int bfin_probe(struct platform_device *pdev) 


	pdata->platform_ops		= &bfin_ops;



	usb_phy_generic_register();

	glue->phy = usb_phy_generic_register();

	if (IS_ERR(glue->phy))

		goto err2;

	platform_set_drvdata(pdev, glue);



	memset(musb_resources, 0x00, sizeof(*musb_resources) *
@@ -513,6 +516,9 @@ static int bfin_probe(struct platform_device *pdev) 
	return 0;



err3:

	usb_phy_generic_unregister(glue->phy);



err2:

	platform_device_put(musb);



err1:
@@ -527,7 +533,7 @@ static int bfin_remove(struct platform_device *pdev) 
	struct bfin_glue		*glue = platform_get_drvdata(pdev);



	platform_device_unregister(glue->musb);

	usb_phy_generic_unregister();

	usb_phy_generic_unregister(glue->phy);

	kfree(glue);



	return 0;

drivers/usb/musb/da8xx.c

+11 −3
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
struct da8xx_glue {

	struct device		*dev;

	struct platform_device	*musb;

	struct platform_device	*phy;

	struct clk		*clk;

};
@@ -510,7 +511,11 @@ static int da8xx_probe(struct platform_device *pdev) 


	pdata->platform_ops		= &da8xx_ops;



	usb_phy_generic_register();

	glue->phy = usb_phy_generic_register();

	if (IS_ERR(glue->phy)) {

		ret = PTR_ERR(glue->phy);

		goto err5;

	}

	platform_set_drvdata(pdev, glue);



	memset(musb_resources, 0x00, sizeof(*musb_resources) *
@@ -537,11 +542,14 @@ static int da8xx_probe(struct platform_device *pdev) 
	if (IS_ERR(musb)) {

		ret = PTR_ERR(musb);

		dev_err(&pdev->dev, "failed to register musb device: %d\n", ret);

		goto err5;

		goto err6;

	}



	return 0;



err6:

	usb_phy_generic_unregister(glue->phy);



err5:

	clk_disable(clk);
@@ -560,7 +568,7 @@ static int da8xx_remove(struct platform_device *pdev) 
	struct da8xx_glue		*glue = platform_get_drvdata(pdev);



	platform_device_unregister(glue->musb);

	usb_phy_generic_unregister();

	usb_phy_generic_unregister(glue->phy);

	clk_disable(glue->clk);

	clk_put(glue->clk);

	kfree(glue);

drivers/usb/musb/tusb6010.c

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
struct tusb6010_glue {

	struct device		*dev;

	struct platform_device	*musb;

	struct platform_device	*phy;

};



static void tusb_musb_set_vbus(struct musb *musb, int is_on);
@@ -1222,7 +1223,7 @@ static int tusb_remove(struct platform_device *pdev) 
	struct tusb6010_glue		*glue = platform_get_drvdata(pdev);



	platform_device_unregister(glue->musb);

	usb_phy_generic_unregister();

	usb_phy_generic_unregister(glue->phy);

	kfree(glue);



	return 0;

drivers/usb/phy/phy-generic.c

+5 −14
Original line number Diff line number Diff line
@@ -41,25 +41,16 @@ 


#include "phy-generic.h"



static struct platform_device *pd;



void usb_phy_generic_register(void)

struct platform_device *usb_phy_generic_register(void)

{

	if (pd)

		return;

	pd = platform_device_register_simple("usb_phy_generic", -1, NULL, 0);

	if (IS_ERR(pd)) {

		pr_err("Unable to register generic usb transceiver\n");

		pd = NULL;

		return;

	}

	return platform_device_register_simple("usb_phy_generic",

			PLATFORM_DEVID_AUTO, NULL, 0);

}

EXPORT_SYMBOL_GPL(usb_phy_generic_register);



void usb_phy_generic_unregister(void)

void usb_phy_generic_unregister(struct platform_device *pdev)

{

	platform_device_unregister(pd);

	pd = NULL;

	platform_device_unregister(pdev);

}

EXPORT_SYMBOL_GPL(usb_phy_generic_unregister);