diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-03-24 23:31:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-24 23:31:22 -0700 |
| commit | 47cb035560a41bd1bd3db506eeab93088815203e (patch) | |
| tree | c582c6966508203526cb588046af7519779a98cc /drivers/net/ax88796.c | |
| parent | bef28b11597a4da9ef3b8a51776b8cb14b427e5e (diff) | |
| download | talos-op-linux-47cb035560a41bd1bd3db506eeab93088815203e.tar.gz talos-op-linux-47cb035560a41bd1bd3db506eeab93088815203e.zip | |
drivers/net/ax88796.c: take IRQ flags from platform_device
This patch adds support to the ax88796 ethernet driver to take IRQ flags
given by the platform_device definition.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ax88796.c')
| -rw-r--r-- | drivers/net/ax88796.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index a4eb6c40678c..e7c9748437d4 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c @@ -93,6 +93,7 @@ struct ax_device { unsigned char running; unsigned char resume_open; + unsigned int irqflags; u32 reg_offsets[0x20]; }; @@ -474,7 +475,8 @@ static int ax_open(struct net_device *dev) dev_dbg(&ax->dev->dev, "%s: open\n", dev->name); - ret = request_irq(dev->irq, ax_ei_interrupt, 0, dev->name, dev); + ret = request_irq(dev->irq, ax_ei_interrupt, ax->irqflags, + dev->name, dev); if (ret) return ret; @@ -829,7 +831,7 @@ static int ax_probe(struct platform_device *pdev) struct ax_device *ax; struct resource *res; size_t size; - int ret; + int ret = 0; dev = ax__alloc_ei_netdev(sizeof(struct ax_device)); if (dev == NULL) @@ -850,12 +852,14 @@ static int ax_probe(struct platform_device *pdev) /* find the platform resources */ - ret = platform_get_irq(pdev, 0); - if (ret < 0) { + res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (res == NULL) { dev_err(&pdev->dev, "no IRQ specified\n"); goto exit_mem; } - dev->irq = ret; + + dev->irq = res->start; + ax->irqflags = res->flags & IRQF_TRIGGER_MASK; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { |
