From 3b7180f9b2b6e067c7c58e8804982a4927bc0125 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Thu, 16 May 2013 13:15:51 +0200 Subject: drivers/usb/host: don't check resource with devm_ioremap_resource devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver. Signed-off-by: Wolfram Sang Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ohci-nxp.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/usb/host/ohci-nxp.c') diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c index f4988fbe78e7..f303cb04c2dd 100644 --- a/drivers/usb/host/ohci-nxp.c +++ b/drivers/usb/host/ohci-nxp.c @@ -300,12 +300,6 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev) } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "Failed to get MEM resource\n"); - ret = -ENOMEM; - goto out8; - } - hcd->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(hcd->regs)) { ret = PTR_ERR(hcd->regs); -- cgit v1.2.3 From 2607845e61aeb5de25053eca8bf5fdbf7838b39a Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 17 May 2013 15:21:23 +0530 Subject: usb: host: ohci-nxp: Remove redundant platform_set_drvdata() Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat Cc: Dmitry Chigirev Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ohci-nxp.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/usb/host/ohci-nxp.c') diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c index f303cb04c2dd..86d04ed24b72 100644 --- a/drivers/usb/host/ohci-nxp.c +++ b/drivers/usb/host/ohci-nxp.c @@ -360,8 +360,6 @@ static int usb_hcd_nxp_remove(struct platform_device *pdev) i2c_unregister_device(isp1301_i2c_client); isp1301_i2c_client = NULL; - platform_set_drvdata(pdev, NULL); - return 0; } -- cgit v1.2.3 From 16520a2cb2bbf0272d457a3c304759f4172d573c Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Wed, 22 May 2013 15:21:25 +0200 Subject: drivers/usb/host: remove leftover release_mem_region When converting this driver to devm_ioremap_resource, the removal of this now unneeded function has been forgotten. Signed-off-by: Wolfram Sang Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ohci-nxp.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/usb/host/ohci-nxp.c') diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c index 281ba57a11e2..7d7d507d54e8 100644 --- a/drivers/usb/host/ohci-nxp.c +++ b/drivers/usb/host/ohci-nxp.c @@ -351,7 +351,6 @@ static int usb_hcd_nxp_remove(struct platform_device *pdev) usb_remove_hcd(hcd); nxp_stop_hc(); - release_mem_region(hcd->rsrc_start, hcd->rsrc_len); usb_put_hcd(hcd); clk_disable(usb_pll_clk); clk_put(usb_pll_clk); -- cgit v1.2.3