leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ixp4xx_eth: Stop referring to GPIOs

Browse Source 
The driver is being passed interrupts, then looking up the
same interrupts as GPIOs a second time to convert them into
interrupts and set properties on them.

This is pointless: the GPIO and irqchip APIs of a GPIO chip
are orthogonal. Just request the interrupts and be done
with it, drop reliance on any GPIO functions or definitions.

Use devres-managed functions and add a small devress quirk
to unregister the clock as well and we can rely on devres
to handle all the resources and cut down a bunch of
boilerplate in the process.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Linus Walleij 2021-08-28 19:15:46 +02:00 committed by David S. Miller
parent f52749a285
commit 13dc931918
1 changed files with 28 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
drivers/net/ethernet/xscale/ptp_ixp46x.c
View File

@ -7,7 +7,6 @@
#include <linux/device.h>
#include <linux/module.h>
#include <linux/err.h>
#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
@ -23,8 +22,6 @@
#define DRIVER "ptp_ixp46x"
#define N_EXT_TS 2
#define MASTER_GPIO 8
#define SLAVE_GPIO 7
struct ixp_clock {
struct ixp46x_ts_regs *regs;
@ -245,38 +242,6 @@ static const struct ptp_clock_info ptp_ixp_caps = {
static struct ixp_clock ixp_clock;
static int setup_interrupt(int gpio)
{
int irq;
int err;
err = gpio_request(gpio, "ixp4-ptp");
if (err)
return err;
err = gpio_direction_input(gpio);
if (err)
return err;
irq = gpio_to_irq(gpio);
if (irq < 0)
return irq;
err = irq_set_irq_type(irq, IRQF_TRIGGER_FALLING);
if (err) {
pr_err("cannot set trigger type for irq %d\n", irq);
return err;
}
err = request_irq(irq, isr, 0, DRIVER, &ixp_clock);
if (err) {
pr_err("request_irq failed for irq %d\n", irq);
return err;
}
return irq;
}
int ixp46x_ptp_find(struct ixp46x_ts_regs *__iomem *regs, int *phc_index)
{
*regs = ixp_clock.regs;
@ -289,18 +254,20 @@ int ixp46x_ptp_find(struct ixp46x_ts_regs *__iomem *regs, int *phc_index)
}
EXPORT_SYMBOL_GPL(ixp46x_ptp_find);
static int ptp_ixp_remove(struct platform_device *pdev)
/* Called from the registered devm action */
static void ptp_ixp_unregister_action(void *d)
{
free_irq(ixp_clock.master_irq, &ixp_clock);
free_irq(ixp_clock.slave_irq, &ixp_clock);
ptp_clock_unregister(ixp_clock.ptp_clock);
ixp_clock.ptp_clock = NULL;
struct ptp_clock *ptp_clock = d;
return 0;
ptp_clock_unregister(ptp_clock);
ixp_clock.ptp_clock = NULL;
}
static int ptp_ixp_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
int ret;
ixp_clock.regs = devm_platform_ioremap_resource(pdev, 0);
ixp_clock.master_irq = platform_get_irq(pdev, 0);
ixp_clock.slave_irq = platform_get_irq(pdev, 1);
@ -315,34 +282,39 @@ static int ptp_ixp_probe(struct platform_device *pdev)
if (IS_ERR(ixp_clock.ptp_clock))
return PTR_ERR(ixp_clock.ptp_clock);
ret = devm_add_action_or_reset(dev, ptp_ixp_unregister_action,
ixp_clock.ptp_clock);
if (ret) {
dev_err(dev, "failed to install clock removal handler\n");
return ret;
}
__raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend);
__raw_writel(1, &ixp_clock.regs->trgt_lo);
__raw_writel(0, &ixp_clock.regs->trgt_hi);
__raw_writel(TTIPEND, &ixp_clock.regs->event);
if (ixp_clock.master_irq != setup_interrupt(MASTER_GPIO)) {
pr_err("failed to setup gpio %d as irq\n", MASTER_GPIO);
goto no_master;
}
if (ixp_clock.slave_irq != setup_interrupt(SLAVE_GPIO)) {
pr_err("failed to setup gpio %d as irq\n", SLAVE_GPIO);
goto no_slave;
}
ret = devm_request_irq(dev, ixp_clock.master_irq, isr,
0, DRIVER, &ixp_clock);
if (ret)
return dev_err_probe(dev, ret,
"request_irq failed for irq %d\n",
ixp_clock.master_irq);
ret = devm_request_irq(dev, ixp_clock.slave_irq, isr,
0, DRIVER, &ixp_clock);
if (ret)
return dev_err_probe(dev, ret,
"request_irq failed for irq %d\n",
ixp_clock.slave_irq);
return 0;
no_slave:
free_irq(ixp_clock.master_irq, &ixp_clock);
no_master:
ptp_clock_unregister(ixp_clock.ptp_clock);
ixp_clock.ptp_clock = NULL;
return -ENODEV;
}
static struct platform_driver ptp_ixp_driver = {
.driver.name = "ptp-ixp46x",
.driver.suppress_bind_attrs = true,
.probe = ptp_ixp_probe,
.remove = ptp_ixp_remove,
};
module_platform_driver(ptp_ixp_driver);