Skip to content

Commit

Permalink
NET: sa11x0-ir: obtain interrupt number from platform resources
Browse files Browse the repository at this point in the history
Convert the sa11x0-ir driver to obtain its interrupt number from the
platform device resources, rather than via the asm/irq.h include.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Feb 9, 2012
1 parent d323860 commit e556fdb
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/net/irda/sa1100_ir.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include <net/irda/wrapper.h>
#include <net/irda/irda_device.h>

#include <asm/irq.h>
#include <mach/dma.h>
#include <mach/hardware.h>
#include <asm/mach/irda.h>
Expand Down Expand Up @@ -900,11 +899,15 @@ static int sa1100_irda_probe(struct platform_device *pdev)
struct net_device *dev;
struct sa1100_irda *si;
unsigned int baudrate_mask;
int err;
int err, irq;

if (!pdev->dev.platform_data)
return -EINVAL;

irq = platform_get_irq(pdev, 0);
if (irq <= 0)
return irq < 0 ? irq : -ENXIO;

err = request_mem_region(__PREG(Ser2UTCR0), 0x24, "IrDA") ? 0 : -EBUSY;
if (err)
goto err_mem_1;
Expand Down Expand Up @@ -936,7 +939,7 @@ static int sa1100_irda_probe(struct platform_device *pdev)
goto err_mem_5;

dev->netdev_ops = &sa1100_irda_netdev_ops;
dev->irq = IRQ_Ser2ICP;
dev->irq = irq;

irda_init_max_qos_capabilies(&si->qos);

Expand Down

0 comments on commit e556fdb

Please sign in to comment.