On 1/25/2017 2:14 PM, Heiner Kallweit wrote:
> The irq is available in hsotg already, so there's no need to
> pass it as separate function parameter.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx>
> ---
> drivers/usb/dwc2/core.h | 2 +-
> drivers/usb/dwc2/hcd.c | 4 ++--
> drivers/usb/dwc2/hcd.h | 2 +-
> drivers/usb/dwc2/platform.c | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
> index 570a8004..e89943ff 100644
> --- a/drivers/usb/dwc2/core.h
> +++ b/drivers/usb/dwc2/core.h
> @@ -1245,7 +1245,7 @@ static inline void dwc2_hcd_connect(struct dwc2_hsotg *hsotg) {}
> static inline void dwc2_hcd_disconnect(struct dwc2_hsotg *hsotg, bool force) {}
> static inline void dwc2_hcd_start(struct dwc2_hsotg *hsotg) {}
> static inline void dwc2_hcd_remove(struct dwc2_hsotg *hsotg) {}
> -static inline int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
> +static inline int dwc2_hcd_init(struct dwc2_hsotg *hsotg)
> { return 0; }
> static inline int dwc2_backup_host_registers(struct dwc2_hsotg *hsotg)
> { return 0; }
> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> index fa8a9f27..ef568c46 100644
> --- a/drivers/usb/dwc2/hcd.c
> +++ b/drivers/usb/dwc2/hcd.c
> @@ -4965,7 +4965,7 @@ static void dwc2_hcd_release(struct dwc2_hsotg *hsotg)
> * USB bus with the core and calls the hc_driver->start() function. It returns
> * a negative error on failure.
> */
> -int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
> +int dwc2_hcd_init(struct dwc2_hsotg *hsotg)
> {
> struct platform_device *pdev = to_platform_device(hsotg->dev);
> struct resource *res;
> @@ -5168,7 +5168,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
> * allocates the DMA buffer pool, registers the USB bus, requests the
> * IRQ line, and calls hcd_start method.
> */
> - retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
> + retval = usb_add_hcd(hcd, hsotg->irq, IRQF_SHARED);
> if (retval < 0)
> goto error4;
>
> diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
> index 58bfe9f5..11c3c145 100644
> --- a/drivers/usb/dwc2/hcd.h
> +++ b/drivers/usb/dwc2/hcd.h
> @@ -521,7 +521,7 @@ static inline u8 dwc2_hcd_is_pipe_out(struct dwc2_hcd_pipe_info *pipe)
> return !dwc2_hcd_is_pipe_in(pipe);
> }
>
> -int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq);
> +int dwc2_hcd_init(struct dwc2_hsotg *hsotg);
> void dwc2_hcd_remove(struct dwc2_hsotg *hsotg);
>
> /* Transaction Execution Functions */
> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
> index 3f59a73d..9564bc76 100644
> --- a/drivers/usb/dwc2/platform.c
> +++ b/drivers/usb/dwc2/platform.c
> @@ -445,7 +445,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
> }
>
> if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) {
> - retval = dwc2_hcd_init(hsotg, hsotg->irq);
> + retval = dwc2_hcd_init(hsotg);
> if (retval) {
> if (hsotg->gadget_enabled)
> dwc2_hsotg_remove(hsotg);
>
Acked-by: John Youn <johnyoun@xxxxxxxxxxxx>
John
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
