Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 667c45c2 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Felipe Balbi
Browse files

usb: isp1760: Set IRQF_SHARED flag in core code



The IRQF_SHARED flag needs to be set regardless of the bus type. Don't
require glue code to set it manually.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 4b1a577d
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
	if (IS_ERR(isp->regs))
		return PTR_ERR(isp->regs);

	ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq, irqflags,
				   dev, devflags);
	ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq,
				   irqflags | IRQF_SHARED, dev, devflags);
	if (ret < 0)
		return ret;

+4 −5
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ static int isp1761_pci_probe(struct pci_dev *dev,
	pci_set_master(dev);

	dev->dev.dma_mask = NULL;
	ret = isp1760_register(&dev->resource[3], dev->irq, IRQF_SHARED,
			       &dev->dev, devflags);
	ret = isp1760_register(&dev->resource[3], dev->irq, 0, &dev->dev,
			       devflags);
	if (ret < 0)
		goto error;

@@ -190,7 +190,7 @@ static struct pci_driver isp1761_pci_driver = {

static int isp1760_plat_probe(struct platform_device *pdev)
{
	unsigned long irqflags = IRQF_SHARED;
	unsigned long irqflags;
	unsigned int devflags = 0;
	struct resource *mem_res;
	struct resource *irq_res;
@@ -203,8 +203,7 @@ static int isp1760_plat_probe(struct platform_device *pdev)
		pr_warning("isp1760: IRQ resource not available\n");
		return -ENODEV;
	}

	irqflags |= irq_res->flags & IRQF_TRIGGER_MASK;
	irqflags = irq_res->flags & IRQF_TRIGGER_MASK;

	if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {
		struct device_node *dp = pdev->dev.of_node;