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

Commit 477527ba authored by Jingoo Han's avatar Jingoo Han Committed by Greg Kroah-Hartman
Browse files

USB: host: use platform_{get,set}_drvdata() 



Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70de8f3e

drivers/usb/host/ehci-grlib.c

+2 −4
Original line number Diff line number Diff line
@@ -153,9 +153,7 @@ static int ehci_hcd_grlib_probe(struct platform_device *op) 


static int ehci_hcd_grlib_remove(struct platform_device *op)

{

	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);



	dev_set_drvdata(&op->dev, NULL);

	struct usb_hcd *hcd = platform_get_drvdata(op);



	dev_dbg(&op->dev, "stopping GRLIB GRUSBHC EHCI USB Controller\n");
@@ -171,7 +169,7 @@ static int ehci_hcd_grlib_remove(struct platform_device *op) 


static void ehci_hcd_grlib_shutdown(struct platform_device *op)

{

	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);

	struct usb_hcd *hcd = platform_get_drvdata(op);



	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

drivers/usb/host/ehci-ppc-of.c

+2 −4
Original line number Diff line number Diff line
@@ -180,14 +180,12 @@ static int ehci_hcd_ppc_of_probe(struct platform_device *op) 


static int ehci_hcd_ppc_of_remove(struct platform_device *op)

{

	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);

	struct usb_hcd *hcd = platform_get_drvdata(op);

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);



	struct device_node *np;

	struct resource res;



	dev_set_drvdata(&op->dev, NULL);



	dev_dbg(&op->dev, "stopping PPC-OF USB Controller\n");



	usb_remove_hcd(hcd);
@@ -219,7 +217,7 @@ static int ehci_hcd_ppc_of_remove(struct platform_device *op) 


static void ehci_hcd_ppc_of_shutdown(struct platform_device *op)

{

	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);

	struct usb_hcd *hcd = platform_get_drvdata(op);



	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

drivers/usb/host/ehci-xilinx-of.c

+2 −3
Original line number Diff line number Diff line
@@ -209,8 +209,7 @@ static int ehci_hcd_xilinx_of_probe(struct platform_device *op) 
 */

static int ehci_hcd_xilinx_of_remove(struct platform_device *op)

{

	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);

	dev_set_drvdata(&op->dev, NULL);

	struct usb_hcd *hcd = platform_get_drvdata(op);



	dev_dbg(&op->dev, "stopping XILINX-OF USB Controller\n");
@@ -229,7 +228,7 @@ static int ehci_hcd_xilinx_of_remove(struct platform_device *op) 
 */

static void ehci_hcd_xilinx_of_shutdown(struct platform_device *op)

{

	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);

	struct usb_hcd *hcd = platform_get_drvdata(op);



	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

drivers/usb/host/isp1760-if.c

+4 −6
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int of_isp1760_probe(struct platform_device *dev) 
		goto free_gpio;

	}



	dev_set_drvdata(&dev->dev, drvdata);

	platform_set_drvdata(dev, drvdata);

	return ret;



free_gpio:
@@ -133,9 +133,7 @@ static int of_isp1760_probe(struct platform_device *dev) 


static int of_isp1760_remove(struct platform_device *dev)

{

	struct isp1760 *drvdata = dev_get_drvdata(&dev->dev);



	dev_set_drvdata(&dev->dev, NULL);

	struct isp1760 *drvdata = platform_get_drvdata(dev);



	usb_remove_hcd(drvdata->hcd);

	iounmap(drvdata->hcd->regs);
@@ -398,7 +396,7 @@ static int isp1760_plat_probe(struct platform_device *pdev) 
			       irqflags, -ENOENT,

			       &pdev->dev, dev_name(&pdev->dev), devflags);



	dev_set_drvdata(&pdev->dev, hcd);

	platform_set_drvdata(pdev, hcd);



	if (IS_ERR(hcd)) {

		pr_warning("isp1760: Failed to register the HCD device\n");
@@ -419,7 +417,7 @@ static int isp1760_plat_remove(struct platform_device *pdev) 
{

	struct resource *mem_res;

	resource_size_t mem_size;

	struct usb_hcd *hcd = dev_get_drvdata(&pdev->dev);

	struct usb_hcd *hcd = platform_get_drvdata(pdev);



	usb_remove_hcd(hcd);

drivers/usb/host/ohci-ppc-of.c

+2 −3
Original line number Diff line number Diff line
@@ -185,8 +185,7 @@ static int ohci_hcd_ppc_of_probe(struct platform_device *op) 


static int ohci_hcd_ppc_of_remove(struct platform_device *op)

{

	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);

	dev_set_drvdata(&op->dev, NULL);

	struct usb_hcd *hcd = platform_get_drvdata(op);



	dev_dbg(&op->dev, "stopping PPC-OF USB Controller\n");
@@ -203,7 +202,7 @@ static int ohci_hcd_ppc_of_remove(struct platform_device *op) 


static void ohci_hcd_ppc_of_shutdown(struct platform_device *op)

{

	struct usb_hcd *hcd = dev_get_drvdata(&op->dev);

	struct usb_hcd *hcd = platform_get_drvdata(op);



        if (hcd->driver->shutdown)

                hcd->driver->shutdown(hcd);