mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
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: Jingoo Han <jg1.han@samsung.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
70de8f3ef0
commit
477527baf6
8 changed files with 16 additions and 26 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -157,9 +157,7 @@ static int uhci_hcd_grlib_probe(struct platform_device *op)
|
|||
|
||||
static int uhci_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 UHCI USB Controller\n");
|
||||
|
||||
|
@ -183,7 +181,7 @@ static int uhci_hcd_grlib_remove(struct platform_device *op)
|
|||
*/
|
||||
static void uhci_hcd_grlib_shutdown(struct platform_device *op)
|
||||
{
|
||||
struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
|
||||
struct usb_hcd *hcd = platform_get_drvdata(op);
|
||||
|
||||
uhci_hc_died(hcd_to_uhci(hcd));
|
||||
}
|
||||
|
|
|
@ -143,7 +143,7 @@ static int uhci_hcd_platform_remove(struct platform_device *pdev)
|
|||
*/
|
||||
static void uhci_hcd_platform_shutdown(struct platform_device *op)
|
||||
{
|
||||
struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
|
||||
struct usb_hcd *hcd = platform_get_drvdata(op);
|
||||
|
||||
uhci_hc_died(hcd_to_uhci(hcd));
|
||||
}
|
||||
|
|
|
@ -130,7 +130,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
|
|||
goto unmap_registers;
|
||||
|
||||
/* USB 2.0 roothub is stored in the platform_device now. */
|
||||
hcd = dev_get_drvdata(&pdev->dev);
|
||||
hcd = platform_get_drvdata(pdev);
|
||||
xhci = hcd_to_xhci(hcd);
|
||||
xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev,
|
||||
dev_name(&pdev->dev), hcd);
|
||||
|
|
Loading…
Reference in a new issue