Skip to content

Commit 08b8a8c

Browse files
committed
cxl/pci: Remove hardirq handler for cxl_request_irq()
Now that all callers of cxl_request_irq() are using threaded irqs, drop the hardirq handler option. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent e30a106 commit 08b8a8c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/cxl/pci.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ struct cxl_dev_id {
9090
};
9191

9292
static int cxl_request_irq(struct cxl_dev_state *cxlds, int irq,
93-
irq_handler_t handler, irq_handler_t thread_fn)
93+
irq_handler_t thread_fn)
9494
{
9595
struct device *dev = cxlds->dev;
9696
struct cxl_dev_id *dev_id;
@@ -101,9 +101,9 @@ static int cxl_request_irq(struct cxl_dev_state *cxlds, int irq,
101101
return -ENOMEM;
102102
dev_id->cxlds = cxlds;
103103

104-
return devm_request_threaded_irq(dev, irq, handler, thread_fn,
105-
IRQF_SHARED | IRQF_ONESHOT,
106-
NULL, dev_id);
104+
return devm_request_threaded_irq(dev, irq, NULL, thread_fn,
105+
IRQF_SHARED | IRQF_ONESHOT, NULL,
106+
dev_id);
107107
}
108108

109109
static bool cxl_mbox_background_complete(struct cxl_dev_state *cxlds)
@@ -440,7 +440,7 @@ static int cxl_pci_setup_mailbox(struct cxl_memdev_state *mds)
440440
if (irq < 0)
441441
return 0;
442442

443-
if (cxl_request_irq(cxlds, irq, NULL, cxl_pci_mbox_irq))
443+
if (cxl_request_irq(cxlds, irq, cxl_pci_mbox_irq))
444444
return 0;
445445

446446
dev_dbg(cxlds->dev, "Mailbox interrupts enabled\n");
@@ -638,7 +638,7 @@ static int cxl_event_req_irq(struct cxl_dev_state *cxlds, u8 setting)
638638
if (irq < 0)
639639
return irq;
640640

641-
return cxl_request_irq(cxlds, irq, NULL, cxl_event_thread);
641+
return cxl_request_irq(cxlds, irq, cxl_event_thread);
642642
}
643643

644644
static int cxl_event_get_int_policy(struct cxl_memdev_state *mds,

0 commit comments

Comments
 (0)