* [5/6] usb: dwc2: eliminate irq parameter from dwc2_gadget_init
@ 2018-02-15 15:37 Grigor Tovmasyan
0 siblings, 0 replies; 3+ messages in thread
From: Grigor Tovmasyan @ 2018-02-15 15:37 UTC (permalink / raw)
To: Felipe Balbi, Grigor Tovmasyan, John Youn, Greg Kroah-Hartman, linux-usb
On 2/15/2018 17:08, Felipe Balbi wrote:
> Grigor Tovmasyan <Grigor.Tovmasyan@synopsys.com> writes:
>
>> From: Vardan Mikayelyan <mvardan@synopsys.com>
>>
>> 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>
>
> doesn't apply. 1-4 are applied. Please rebase on testing/next
>
Seems like this patch was already merged with your testing/text.
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* [5/6] usb: dwc2: eliminate irq parameter from dwc2_gadget_init
@ 2018-02-15 13:07 Felipe Balbi
0 siblings, 0 replies; 3+ messages in thread
From: Felipe Balbi @ 2018-02-15 13:07 UTC (permalink / raw)
To: Grigor Tovmasyan, John Youn, Greg Kroah-Hartman, linux-usb
Grigor Tovmasyan <Grigor.Tovmasyan@synopsys.com> writes:
> From: Vardan Mikayelyan <mvardan@synopsys.com>
>
> 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>
doesn't apply. 1-4 are applied. Please rebase on testing/next
^ permalink raw reply [flat|nested] 3+ messages in thread
* [5/6] usb: dwc2: eliminate irq parameter from dwc2_gadget_init
@ 2018-01-16 12:04 Grigor Tovmasyan
0 siblings, 0 replies; 3+ messages in thread
From: Grigor Tovmasyan @ 2018-01-16 12:04 UTC (permalink / raw)
To: John Youn, Felipe Balbi, Greg Kroah-Hartman, linux-usb; +Cc: Grigor Tovmasyan
From: Vardan Mikayelyan <mvardan@synopsys.com>
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>
---
drivers/usb/dwc2/core.h | 4 ++--
drivers/usb/dwc2/gadget.c | 7 +++----
drivers/usb/dwc2/platform.c | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 91566d35c028..232a3aa8c9b1 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -1179,7 +1179,7 @@ void dwc2_dump_global_registers(struct dwc2_hsotg *hsotg);
int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg);
int dwc2_hsotg_suspend(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,
bool reset);
void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg);
@@ -1198,7 +1198,7 @@ static inline int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2)
{ return 0; }
static inline int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2)
{ 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; }
static inline void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
bool reset) {}
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index dc5d11dfa962..a8b63821b513 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -4644,9 +4644,8 @@ static void dwc2_hsotg_dump(struct dwc2_hsotg *hsotg)
/**
* dwc2_gadget_init - init function for gadget
* @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;
int epnum;
@@ -4687,8 +4686,8 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
return ret;
}
- ret = devm_request_irq(hsotg->dev, irq, dwc2_hsotg_irq, IRQF_SHARED,
- dev_name(hsotg->dev), hsotg);
+ ret = devm_request_irq(hsotg->dev, hsotg->irq, dwc2_hsotg_irq,
+ IRQF_SHARED, dev_name(hsotg->dev), hsotg);
if (ret < 0) {
dev_err(dev, "cannot claim IRQ for gadget\n");
return ret;
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 3e26550d13dd..74be91c559c8 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -429,7 +429,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
goto error;
if (hsotg->dr_mode != USB_DR_MODE_HOST) {
- retval = dwc2_gadget_init(hsotg, hsotg->irq);
+ retval = dwc2_gadget_init(hsotg);
if (retval)
goto error;
hsotg->gadget_enabled = 1;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-15 15:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-15 15:37 [5/6] usb: dwc2: eliminate irq parameter from dwc2_gadget_init Grigor Tovmasyan
-- strict thread matches above, loose matches on Subject: below --
2018-02-15 13:07 Felipe Balbi
2018-01-16 12:04 Grigor Tovmasyan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.