diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2013-09-18 15:24:44 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-10-24 11:50:35 +0100 |
| commit | f7578496a671a96e501f16a5104893275e32c33a (patch) | |
| tree | f1bc2db4847acdea2bb4c777782b29c35c084ae2 /drivers/input/serio | |
| parent | 3da5278727a895d49a601f67fd49dffa0b80f9a5 (diff) | |
| download | talos-obmc-linux-f7578496a671a96e501f16a5104893275e32c33a.tar.gz talos-obmc-linux-f7578496a671a96e501f16a5104893275e32c33a.zip | |
of/irq: Use irq_of_parse_and_map()
Replace some instances of of_irq_map_one()/irq_create_of_mapping() and
of_irq_to_resource() by the simpler equivalent irq_of_parse_and_map().
Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
[grant.likely: resolved conflicts with core code renames]
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index 4b7662a17ae9..36f7b9533397 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c @@ -235,12 +235,12 @@ static void sxps2_close(struct serio *pserio) */ static int xps2_of_probe(struct platform_device *ofdev) { - struct resource r_irq; /* Interrupt resources */ struct resource r_mem; /* IO mem resources */ struct xps2data *drvdata; struct serio *serio; struct device *dev = &ofdev->dev; resource_size_t remap_size, phys_addr; + unsigned int irq; int error; dev_info(dev, "Device Tree Probing \'%s\'\n", @@ -254,7 +254,8 @@ static int xps2_of_probe(struct platform_device *ofdev) } /* Get IRQ for the device */ - if (!of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq)) { + irq = irq_of_parse_and_map(ofdev->dev.of_node, 0); + if (!irq) { dev_err(dev, "no IRQ found\n"); return -ENODEV; } @@ -267,7 +268,7 @@ static int xps2_of_probe(struct platform_device *ofdev) } spin_lock_init(&drvdata->lock); - drvdata->irq = r_irq.start; + drvdata->irq = irq; drvdata->serio = serio; drvdata->dev = dev; |
