Skip to content

Commit aee70a1

Browse files
jhovoldgregkh
authored andcommitted
USB: dwc3: qcom: simplify wakeup interrupt setup
Use the IRQF_NO_AUTOEN irq flag when requesting the wakeup interrupts instead of setting it separately. No functional change intended. Signed-off-by: Johan Hovold <[email protected]> Reviewed-by: Andrew Halaney <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 41f5a09 commit aee70a1

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

drivers/usb/dwc3/dwc3-qcom.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -546,10 +546,9 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
546546
pdata ? pdata->hs_phy_irq_index : -1);
547547
if (irq > 0) {
548548
/* Keep wakeup interrupts disabled until suspend */
549-
irq_set_status_flags(irq, IRQ_NOAUTOEN);
550549
ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
551550
qcom_dwc3_resume_irq,
552-
IRQF_ONESHOT,
551+
IRQF_ONESHOT | IRQF_NO_AUTOEN,
553552
"qcom_dwc3 HS", qcom);
554553
if (ret) {
555554
dev_err(qcom->dev, "hs_phy_irq failed: %d\n", ret);
@@ -561,10 +560,9 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
561560
irq = dwc3_qcom_get_irq(pdev, "dp_hs_phy_irq",
562561
pdata ? pdata->dp_hs_phy_irq_index : -1);
563562
if (irq > 0) {
564-
irq_set_status_flags(irq, IRQ_NOAUTOEN);
565563
ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
566564
qcom_dwc3_resume_irq,
567-
IRQF_ONESHOT,
565+
IRQF_ONESHOT | IRQF_NO_AUTOEN,
568566
"qcom_dwc3 DP_HS", qcom);
569567
if (ret) {
570568
dev_err(qcom->dev, "dp_hs_phy_irq failed: %d\n", ret);
@@ -576,10 +574,9 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
576574
irq = dwc3_qcom_get_irq(pdev, "dm_hs_phy_irq",
577575
pdata ? pdata->dm_hs_phy_irq_index : -1);
578576
if (irq > 0) {
579-
irq_set_status_flags(irq, IRQ_NOAUTOEN);
580577
ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
581578
qcom_dwc3_resume_irq,
582-
IRQF_ONESHOT,
579+
IRQF_ONESHOT | IRQF_NO_AUTOEN,
583580
"qcom_dwc3 DM_HS", qcom);
584581
if (ret) {
585582
dev_err(qcom->dev, "dm_hs_phy_irq failed: %d\n", ret);
@@ -591,10 +588,9 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
591588
irq = dwc3_qcom_get_irq(pdev, "ss_phy_irq",
592589
pdata ? pdata->ss_phy_irq_index : -1);
593590
if (irq > 0) {
594-
irq_set_status_flags(irq, IRQ_NOAUTOEN);
595591
ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
596592
qcom_dwc3_resume_irq,
597-
IRQF_ONESHOT,
593+
IRQF_ONESHOT | IRQF_NO_AUTOEN,
598594
"qcom_dwc3 SS", qcom);
599595
if (ret) {
600596
dev_err(qcom->dev, "ss_phy_irq failed: %d\n", ret);

0 commit comments

Comments
 (0)