summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/mcp251x.c
diff options
context:
space:
mode:
authorAlexander Shiyan2013-08-19 13:39:20 +0200
committerMarc Kleine-Budde2013-08-21 09:28:29 +0200
commitae5d589e5f9f3217656ada632869968178886ac6 (patch)
tree4d8aa831b99acb79b7c7d139a4235b4cf8af528e /drivers/net/can/mcp251x.c
parentcan: mcp251x: Replace power callbacks with regulator API (diff)
downloadkernel-qcow2-linux-ae5d589e5f9f3217656ada632869968178886ac6.tar.gz
kernel-qcow2-linux-ae5d589e5f9f3217656ada632869968178886ac6.tar.xz
kernel-qcow2-linux-ae5d589e5f9f3217656ada632869968178886ac6.zip
can: mcp251x: Eliminate irq_flags from driver platform_data
Flags is not used by boards, so remove this field from the driver platform_data. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/mcp251x.c')
-rw-r--r--drivers/net/can/mcp251x.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index d2c54888b211..ec84ce163608 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -935,8 +935,7 @@ static int mcp251x_open(struct net_device *net)
{
struct mcp251x_priv *priv = netdev_priv(net);
struct spi_device *spi = priv->spi;
- struct mcp251x_platform_data *pdata = spi->dev.platform_data;
- unsigned long flags;
+ unsigned long flags = IRQF_ONESHOT | IRQF_TRIGGER_FALLING;
int ret;
ret = open_candev(net);
@@ -952,12 +951,6 @@ static int mcp251x_open(struct net_device *net)
priv->tx_skb = NULL;
priv->tx_len = 0;
- flags = IRQF_ONESHOT;
- if (pdata->irq_flags)
- flags |= pdata->irq_flags;
- else
- flags |= IRQF_TRIGGER_FALLING;
-
ret = request_threaded_irq(spi->irq, NULL, mcp251x_can_ist,
flags, DEVICE_NAME, priv);
if (ret) {