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

Commit 10c73f09 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Felipe Balbi
Browse files

usb: isp1760: Move removal cleanup code to isp1760-hcd.c 



The removal cleanup code is duplicated between the different bus glues.
Move it to a central location.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent c3cc40cc

drivers/usb/host/isp1760-hcd.c

+10 −0
Original line number Diff line number Diff line
@@ -2263,6 +2263,16 @@ struct usb_hcd *isp1760_register(phys_addr_t res_start, resource_size_t res_len, 
	 return ERR_PTR(ret);

}



void isp1760_unregister(struct device *dev)

{

	struct usb_hcd *hcd = dev_get_drvdata(dev);



	usb_remove_hcd(hcd);

	iounmap(hcd->regs);

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

	usb_put_hcd(hcd);

}



MODULE_DESCRIPTION("Driver for the ISP1760 USB-controller from NXP");

MODULE_AUTHOR("Sebastian Siewior <bigeasy@linuxtronix.de>");

MODULE_LICENSE("GPL v2");

drivers/usb/host/isp1760-hcd.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ struct usb_hcd *isp1760_register(phys_addr_t res_start, resource_size_t res_len, 
				 int irq, unsigned long irqflags,

				 struct device *dev, const char *busname,

				 unsigned int devflags);

void isp1760_unregister(struct device *dev);



int init_kmem_once(void);

void deinit_kmem_cache(void);

drivers/usb/host/isp1760-if.c

+2 −14
Original line number Diff line number Diff line
@@ -160,14 +160,7 @@ static int isp1761_pci_probe(struct pci_dev *dev, 


static void isp1761_pci_remove(struct pci_dev *dev)

{

	struct usb_hcd *hcd;



	hcd = pci_get_drvdata(dev);



	usb_remove_hcd(hcd);

	iounmap(hcd->regs);

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

	usb_put_hcd(hcd);

	isp1760_unregister(&dev->dev);



	pci_disable_device(dev);

}
@@ -291,12 +284,7 @@ static int isp1760_plat_probe(struct platform_device *pdev) 


static int isp1760_plat_remove(struct platform_device *pdev)

{

	struct usb_hcd *hcd = platform_get_drvdata(pdev);



	usb_remove_hcd(hcd);

	iounmap(hcd->regs);

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

	usb_put_hcd(hcd);

	isp1760_unregister(&pdev->dev);



	return 0;

}