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

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

USB: host: use dev_get_platdata() 



Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4fae6f0f

drivers/usb/host/ehci-fsl.c

+7 −7
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver, 
	pr_debug("initializing FSL-SOC USB Controller\n");



	/* Need platform data for setup */

	pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data;

	pdata = (struct fsl_usb2_platform_data *)dev_get_platdata(&pdev->dev);

	if (!pdata) {

		dev_err(&pdev->dev,

			"No platform data for %s.\n", dev_name(&pdev->dev));
@@ -190,7 +190,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver, 
static void usb_hcd_fsl_remove(struct usb_hcd *hcd,

			       struct platform_device *pdev)

{

	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;

	struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);



	if (!IS_ERR_OR_NULL(hcd->phy)) {

		otg_set_host(hcd->phy->otg, NULL);
@@ -218,7 +218,7 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd, 
	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	void __iomem *non_ehci = hcd->regs;

	struct device *dev = hcd->self.controller;

	struct fsl_usb2_platform_data *pdata = dev->platform_data;

	struct fsl_usb2_platform_data *pdata = dev_get_platdata(dev);



	if (pdata->controller_ver < 0) {

		dev_warn(hcd->self.controller, "Could not get controller version\n");
@@ -291,7 +291,7 @@ static int ehci_fsl_usb_setup(struct ehci_hcd *ehci) 
	struct fsl_usb2_platform_data *pdata;

	void __iomem *non_ehci = hcd->regs;



	pdata = hcd->self.controller->platform_data;

	pdata = dev_get_platdata(hcd->self.controller);



	if (pdata->have_sysif_regs) {

		/*
@@ -363,7 +363,7 @@ static int ehci_fsl_setup(struct usb_hcd *hcd) 
	struct device *dev;



	dev = hcd->self.controller;

	pdata = hcd->self.controller->platform_data;

	pdata = dev_get_platdata(hcd->self.controller);

	ehci->big_endian_desc = pdata->big_endian_desc;

	ehci->big_endian_mmio = pdata->big_endian_mmio;
@@ -415,7 +415,7 @@ static int ehci_fsl_mpc512x_drv_suspend(struct device *dev) 
{

	struct usb_hcd *hcd = dev_get_drvdata(dev);

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	struct fsl_usb2_platform_data *pdata = dev->platform_data;

	struct fsl_usb2_platform_data *pdata = dev_get_platdata(dev);

	u32 tmp;



#ifdef DEBUG
@@ -484,7 +484,7 @@ static int ehci_fsl_mpc512x_drv_resume(struct device *dev) 
{

	struct usb_hcd *hcd = dev_get_drvdata(dev);

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	struct fsl_usb2_platform_data *pdata = dev->platform_data;

	struct fsl_usb2_platform_data *pdata = dev_get_platdata(dev);

	u32 tmp;



	dev_dbg(dev, "suspend=%d already_suspended=%d\n",

drivers/usb/host/ehci-mv.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static const struct hc_driver mv_ehci_hc_driver = { 


static int mv_ehci_probe(struct platform_device *pdev)

{

	struct mv_usb_platform_data *pdata = pdev->dev.platform_data;

	struct mv_usb_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct usb_hcd *hcd;

	struct ehci_hcd *ehci;

	struct ehci_hcd_mv *ehci_mv;

drivers/usb/host/ehci-mxc.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static const struct ehci_driver_overrides ehci_mxc_overrides __initconst = { 


static int ehci_mxc_drv_probe(struct platform_device *pdev)

{

	struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;

	struct mxc_usbh_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct usb_hcd *hcd;

	struct resource *res;

	int irq, ret;
@@ -174,7 +174,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 


static int ehci_mxc_drv_remove(struct platform_device *pdev)

{

	struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;

	struct mxc_usbh_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct usb_hcd *hcd = platform_get_drvdata(pdev);

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	struct ehci_mxc_priv *priv = (struct ehci_mxc_priv *) ehci->priv;

drivers/usb/host/ehci-omap.c

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static const struct ehci_driver_overrides ehci_omap_overrides __initdata = { 
static int ehci_hcd_omap_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct usbhs_omap_platform_data *pdata = dev->platform_data;

	struct usbhs_omap_platform_data *pdata = dev_get_platdata(dev);

	struct resource	*res;

	struct usb_hcd	*hcd;

	void __iomem *regs;
@@ -119,7 +119,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 


	/* For DT boot, get platform data from parent. i.e. usbhshost */

	if (dev->of_node) {

		pdata = dev->parent->platform_data;

		pdata = dev_get_platdata(dev->parent);

		dev->platform_data = pdata;

	}

drivers/usb/host/ehci-orion.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ ehci_orion_conf_mbus_windows(struct usb_hcd *hcd, 


static int ehci_orion_drv_probe(struct platform_device *pdev)

{

	struct orion_ehci_data *pd = pdev->dev.platform_data;

	struct orion_ehci_data *pd = dev_get_platdata(&pdev->dev);

	const struct mbus_dram_target_info *dram;

	struct resource *res;

	struct usb_hcd *hcd;