Skip to content

S
Simple PCIe FMC carrier SPEC - Software
Commit 0d82d84c authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

wr_nic: irq registration only if WR_IS_SWITCH 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent db830e88
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
kernel/wr_nic/device.c
View file @ 0d82d84c
...@@ -105,13 +105,10 @@ static int wrn_probe(struct platform_device *pdev) ...@@ -105,13 +105,10 @@ static int wrn_probe(struct platform_device *pdev)
struct wrn_dev *wrn = drvdata->wrn; struct wrn_dev *wrn = drvdata->wrn;
int i, err = 0; int i, err = 0;
#if 0
/* Lazily: irqs are not in the resource list */ /* Lazily: irqs are not in the resource list */
static int irqs[] = WRN_IRQ_NUMBERS; static int irqs[] = WRN_IRQ_NUMBERS;
static char *irq_names[] = WRN_IRQ_NAMES; static char *irq_names[] = WRN_IRQ_NAMES;
static irq_handler_t irq_handlers[] = WRN_IRQ_HANDLERS; static irq_handler_t irq_handlers[] = WRN_IRQ_HANDLERS;
#endif
/* No need to lock_irq: we only protect count and continue unlocked */ /* No need to lock_irq: we only protect count and continue unlocked */
if (WR_IS_SWITCH) { if (WR_IS_SWITCH) {
...@@ -138,15 +135,17 @@ static int wrn_probe(struct platform_device *pdev) ...@@ -138,15 +135,17 @@ static int wrn_probe(struct platform_device *pdev)
printk("regs %p, txd %p, rxd %p, buffer %p\n", printk("regs %p, txd %p, rxd %p, buffer %p\n",
wrn->regs, wrn->txd, wrn->rxd, wrn->databuf); wrn->regs, wrn->txd, wrn->rxd, wrn->databuf);
#if 0 if (WR_IS_SWITCH) {
/* Register the interrupt handlers (not shared) */ /* Register the interrupt handlers (not shared) */
for (i = 0; i < ARRAY_SIZE(irq_names); i++) { for (i = 0; i < ARRAY_SIZE(irq_names); i++) {
err = request_irq(irqs[i], irq_handlers[i], err = request_irq(irqs[i], irq_handlers[i],
IRQF_TRIGGER_LOW, irq_names[i], wrn); IRQF_TRIGGER_LOW, irq_names[i], wrn);
if (err) goto out; if (err)
wrn->irq_registered |= 1 << i; goto out;
wrn->irq_registered |= 1 << i;
}
} }
#endif
/* Reset the device, just to be sure, before making anything */ /* Reset the device, just to be sure, before making anything */
writel(0, &wrn->regs->CR); writel(0, &wrn->regs->CR);
mdelay(10); mdelay(10);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment