aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-08-19 07:39:20 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2013-08-21 03:28:29 -0400
commitae5d589e5f9f3217656ada632869968178886ac6 (patch)
tree4d8aa831b99acb79b7c7d139a4235b4cf8af528e
parent1ddff7da0faecffdcdeab3d981fb8241453cea44 (diff)
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>
-rw-r--r--drivers/net/can/mcp251x.c9
-rw-r--r--include/linux/can/platform/mcp251x.h2
2 files changed, 1 insertions, 10 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)
935{ 935{
936 struct mcp251x_priv *priv = netdev_priv(net); 936 struct mcp251x_priv *priv = netdev_priv(net);
937 struct spi_device *spi = priv->spi; 937 struct spi_device *spi = priv->spi;
938 struct mcp251x_platform_data *pdata = spi->dev.platform_data; 938 unsigned long flags = IRQF_ONESHOT | IRQF_TRIGGER_FALLING;
939 unsigned long flags;
940 int ret; 939 int ret;
941 940
942 ret = open_candev(net); 941 ret = open_candev(net);
@@ -952,12 +951,6 @@ static int mcp251x_open(struct net_device *net)
952 priv->tx_skb = NULL; 951 priv->tx_skb = NULL;
953 priv->tx_len = 0; 952 priv->tx_len = 0;
954 953
955 flags = IRQF_ONESHOT;
956 if (pdata->irq_flags)
957 flags |= pdata->irq_flags;
958 else
959 flags |= IRQF_TRIGGER_FALLING;
960
961 ret = request_threaded_irq(spi->irq, NULL, mcp251x_can_ist, 954 ret = request_threaded_irq(spi->irq, NULL, mcp251x_can_ist,
962 flags, DEVICE_NAME, priv); 955 flags, DEVICE_NAME, priv);
963 if (ret) { 956 if (ret) {
diff --git a/include/linux/can/platform/mcp251x.h b/include/linux/can/platform/mcp251x.h
index 8a2725676d8b..dc029dba7a03 100644
--- a/include/linux/can/platform/mcp251x.h
+++ b/include/linux/can/platform/mcp251x.h
@@ -12,12 +12,10 @@
12/* 12/*
13 * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data 13 * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data
14 * @oscillator_frequency: - oscillator frequency in Hz 14 * @oscillator_frequency: - oscillator frequency in Hz
15 * @irq_flags: - IRQF configuration flags
16 */ 15 */
17 16
18struct mcp251x_platform_data { 17struct mcp251x_platform_data {
19 unsigned long oscillator_frequency; 18 unsigned long oscillator_frequency;
20 unsigned long irq_flags;
21}; 19};
22 20
23#endif /* __CAN_PLATFORM_MCP251X_H__ */ 21#endif /* __CAN_PLATFORM_MCP251X_H__ */