usb: dwc2: eliminate irq parameter from dwc2_gadget_init
The irq is available in hsotg already, so there's no need to pass it as separate function parameter. Signed-off-by: Vardan Mikayelyan <mvardan@synopsys.com> Signed-off-by: Grigor Tovmasyan <tovmasya@synopsys.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
parent
13431c6070
commit
f376899701
|
@ -1180,7 +1180,7 @@ void dwc2_dump_global_registers(struct dwc2_hsotg *hsotg);
|
||||||
int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg);
|
int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg);
|
||||||
int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2);
|
int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2);
|
||||||
int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2);
|
int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2);
|
||||||
int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq);
|
int dwc2_gadget_init(struct dwc2_hsotg *hsotg);
|
||||||
void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
|
void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
|
||||||
bool reset);
|
bool reset);
|
||||||
void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg);
|
void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg);
|
||||||
|
@ -1199,7 +1199,7 @@ static inline int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2)
|
||||||
{ return 0; }
|
{ return 0; }
|
||||||
static inline int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2)
|
static inline int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2)
|
||||||
{ return 0; }
|
{ return 0; }
|
||||||
static inline int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
|
static inline int dwc2_gadget_init(struct dwc2_hsotg *hsotg)
|
||||||
{ return 0; }
|
{ return 0; }
|
||||||
static inline void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
|
static inline void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
|
||||||
bool reset) {}
|
bool reset) {}
|
||||||
|
|
|
@ -4606,9 +4606,8 @@ static void dwc2_hsotg_dump(struct dwc2_hsotg *hsotg)
|
||||||
/**
|
/**
|
||||||
* dwc2_gadget_init - init function for gadget
|
* dwc2_gadget_init - init function for gadget
|
||||||
* @dwc2: The data structure for the DWC2 driver.
|
* @dwc2: The data structure for the DWC2 driver.
|
||||||
* @irq: The IRQ number for the controller.
|
|
||||||
*/
|
*/
|
||||||
int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
|
int dwc2_gadget_init(struct dwc2_hsotg *hsotg)
|
||||||
{
|
{
|
||||||
struct device *dev = hsotg->dev;
|
struct device *dev = hsotg->dev;
|
||||||
int epnum;
|
int epnum;
|
||||||
|
@ -4649,8 +4648,8 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = devm_request_irq(hsotg->dev, irq, dwc2_hsotg_irq, IRQF_SHARED,
|
ret = devm_request_irq(hsotg->dev, hsotg->irq, dwc2_hsotg_irq,
|
||||||
dev_name(hsotg->dev), hsotg);
|
IRQF_SHARED, dev_name(hsotg->dev), hsotg);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(dev, "cannot claim IRQ for gadget\n");
|
dev_err(dev, "cannot claim IRQ for gadget\n");
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -439,7 +439,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
if (hsotg->dr_mode != USB_DR_MODE_HOST) {
|
if (hsotg->dr_mode != USB_DR_MODE_HOST) {
|
||||||
retval = dwc2_gadget_init(hsotg, hsotg->irq);
|
retval = dwc2_gadget_init(hsotg);
|
||||||
if (retval)
|
if (retval)
|
||||||
goto error;
|
goto error;
|
||||||
hsotg->gadget_enabled = 1;
|
hsotg->gadget_enabled = 1;
|
||||||
|
|
Loading…
Reference in New Issue