forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: isp1760: Set IRQF_SHARED flag in core code

Browse source 
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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Laurent Pinchart 2015-01-21 00:55:58 +02:00 • committed by Felipe Balbi
parent 4b1a577d41
commit 667c45c2f1
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/host/isp1760-core.c
View file

@ -43,8 +43,8 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
if (IS_ERR(isp->regs)) if (IS_ERR(isp->regs))
return PTR_ERR(isp->regs); return PTR_ERR(isp->regs);
ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq, irqflags, ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq,
dev, devflags); irqflags | IRQF_SHARED, dev, devflags);
if (ret < 0) if (ret < 0)
return ret; return ret;

9
drivers/usb/host/isp1760-if.c
View file

@ -142,8 +142,8 @@ static int isp1761_pci_probe(struct pci_dev *dev,
pci_set_master(dev); pci_set_master(dev);
dev->dev.dma_mask = NULL; dev->dev.dma_mask = NULL;
ret = isp1760_register(&dev->resource[3], dev->irq, IRQF_SHARED, ret = isp1760_register(&dev->resource[3], dev->irq, 0, &dev->dev,
&dev->dev, devflags); devflags);
if (ret < 0) if (ret < 0)
goto error; goto error;
@ -190,7 +190,7 @@ static struct pci_driver isp1761_pci_driver = {
static int isp1760_plat_probe(struct platform_device *pdev) static int isp1760_plat_probe(struct platform_device *pdev)
{ {
unsigned long irqflags = IRQF_SHARED; unsigned long irqflags;
unsigned int devflags = 0; unsigned int devflags = 0;
struct resource *mem_res; struct resource *mem_res;
struct resource *irq_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"); pr_warning("isp1760: IRQ resource not available\n");
return -ENODEV; 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) { if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {
struct device_node *dp = pdev->dev.of_node; struct device_node *dp = pdev->dev.of_node;