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>

diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index d2c54888b2116164902a98ec03bfbbbb07d090be..ec84ce163608d1baacc840f52fc35890a6ffce37 100644 (file)
--- 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) {

diff --git a/include/linux/can/platform/mcp251x.h b/include/linux/can/platform/mcp251x.h
index 8a2725676d8b9899da35bf34ca37a7075192f779..dc029dba7a030d384d9389038b6f7d600eee3dbf 100644 (file)
--- a/include/linux/can/platform/mcp251x.h
+++ b/include/linux/can/platform/mcp251x.h
@@ -12,12 +12,10 @@
 /*
  * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data
  * @oscillator_frequency:       - oscillator frequency in Hz
- * @irq_flags:                  - IRQF configuration flags
  */
 
 struct mcp251x_platform_data {
        unsigned long oscillator_frequency;
-       unsigned long irq_flags;
 };
 
 #endif /* __CAN_PLATFORM_MCP251X_H__ */