From: Sandeep Maheswaram <[email protected]>
Adding helper functions to enable,disable wake irqs to make
the code simple and readable.
Signed-off-by: Sandeep Maheswaram <[email protected]>
Reviewed-by: Matthias Kaehlcke <[email protected]>
Signed-off-by: Krishna Kurapati <[email protected]>
---
drivers/usb/dwc3/dwc3-qcom.c | 58 ++++++++++++++++++++------------------------
1 file changed, 26 insertions(+), 32 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 6cba990..7352124 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -296,50 +296,44 @@ static void dwc3_qcom_interconnect_exit(struct dwc3_qcom *qcom)
icc_put(qcom->icc_path_apps);
}
+static void dwc3_qcom_enable_wakeup_irq(int irq)
+{
+ if (!irq)
+ return;
+
+ enable_irq(irq);
+ enable_irq_wake(irq);
+}
+
+static void dwc3_qcom_disable_wakeup_irq(int irq)
+{
+ if (!irq)
+ return;
+
+ disable_irq_wake(irq);
+ disable_irq_nosync(irq);
+}
+
static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom)
{
- if (qcom->hs_phy_irq) {
- disable_irq_wake(qcom->hs_phy_irq);
- disable_irq_nosync(qcom->hs_phy_irq);
- }
+ dwc3_qcom_disable_wakeup_irq(qcom->hs_phy_irq);
- if (qcom->dp_hs_phy_irq) {
- disable_irq_wake(qcom->dp_hs_phy_irq);
- disable_irq_nosync(qcom->dp_hs_phy_irq);
- }
+ dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq);
- if (qcom->dm_hs_phy_irq) {
- disable_irq_wake(qcom->dm_hs_phy_irq);
- disable_irq_nosync(qcom->dm_hs_phy_irq);
- }
+ dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq);
- if (qcom->ss_phy_irq) {
- disable_irq_wake(qcom->ss_phy_irq);
- disable_irq_nosync(qcom->ss_phy_irq);
- }
+ dwc3_qcom_disable_wakeup_irq(qcom->ss_phy_irq);
}
static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
{
- if (qcom->hs_phy_irq) {
- enable_irq(qcom->hs_phy_irq);
- enable_irq_wake(qcom->hs_phy_irq);
- }
+ dwc3_qcom_enable_wakeup_irq(qcom->hs_phy_irq);
- if (qcom->dp_hs_phy_irq) {
- enable_irq(qcom->dp_hs_phy_irq);
- enable_irq_wake(qcom->dp_hs_phy_irq);
- }
+ dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq);
- if (qcom->dm_hs_phy_irq) {
- enable_irq(qcom->dm_hs_phy_irq);
- enable_irq_wake(qcom->dm_hs_phy_irq);
- }
+ dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq);
- if (qcom->ss_phy_irq) {
- enable_irq(qcom->ss_phy_irq);
- enable_irq_wake(qcom->ss_phy_irq);
- }
+ dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq);
}
static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)
--
2.7.4
On Tue, May 24, 2022 at 03:43:46PM +0530, Krishna Kurapati wrote:
> From: Sandeep Maheswaram <[email protected]>
>
> Adding helper functions to enable,disable wake irqs to make
> the code simple and readable.
>
> Signed-off-by: Sandeep Maheswaram <[email protected]>
> Reviewed-by: Matthias Kaehlcke <[email protected]>
> Signed-off-by: Krishna Kurapati <[email protected]>
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 58 ++++++++++++++++++++------------------------
> 1 file changed, 26 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 6cba990..7352124 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -296,50 +296,44 @@ static void dwc3_qcom_interconnect_exit(struct dwc3_qcom *qcom)
> icc_put(qcom->icc_path_apps);
> }
>
> +static void dwc3_qcom_enable_wakeup_irq(int irq)
> +{
> + if (!irq)
> + return;
> +
> + enable_irq(irq);
> + enable_irq_wake(irq);
> +}
> +
> +static void dwc3_qcom_disable_wakeup_irq(int irq)
> +{
> + if (!irq)
> + return;
> +
> + disable_irq_wake(irq);
> + disable_irq_nosync(irq);
> +}
> +
> static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom)
> {
> - if (qcom->hs_phy_irq) {
> - disable_irq_wake(qcom->hs_phy_irq);
> - disable_irq_nosync(qcom->hs_phy_irq);
> - }
> + dwc3_qcom_disable_wakeup_irq(qcom->hs_phy_irq);
>
> - if (qcom->dp_hs_phy_irq) {
> - disable_irq_wake(qcom->dp_hs_phy_irq);
> - disable_irq_nosync(qcom->dp_hs_phy_irq);
> - }
> + dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq);
>
> - if (qcom->dm_hs_phy_irq) {
> - disable_irq_wake(qcom->dm_hs_phy_irq);
> - disable_irq_nosync(qcom->dm_hs_phy_irq);
> - }
> + dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq);
>
> - if (qcom->ss_phy_irq) {
> - disable_irq_wake(qcom->ss_phy_irq);
> - disable_irq_nosync(qcom->ss_phy_irq);
> - }
> + dwc3_qcom_disable_wakeup_irq(qcom->ss_phy_irq);
> }
>
> static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
> {
> - if (qcom->hs_phy_irq) {
> - enable_irq(qcom->hs_phy_irq);
> - enable_irq_wake(qcom->hs_phy_irq);
> - }
> + dwc3_qcom_enable_wakeup_irq(qcom->hs_phy_irq);
>
> - if (qcom->dp_hs_phy_irq) {
> - enable_irq(qcom->dp_hs_phy_irq);
> - enable_irq_wake(qcom->dp_hs_phy_irq);
> - }
> + dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq);
>
> - if (qcom->dm_hs_phy_irq) {
> - enable_irq(qcom->dm_hs_phy_irq);
> - enable_irq_wake(qcom->dm_hs_phy_irq);
> - }
> + dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq);
>
> - if (qcom->ss_phy_irq) {
> - enable_irq(qcom->ss_phy_irq);
> - enable_irq_wake(qcom->ss_phy_irq);
> - }
> + dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq);
> }
>
> static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)
> --
> 2.7.4
>
Looks good to me. Feel free to add
Reviewed-by: Pavankumar Kondeti <[email protected]>
Thanks,
Pavan