Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5d589e authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Marc Kleine-Budde
Browse files

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: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 1ddff7da

drivers/net/can/mcp251x.c

+1 −8
Original line number Diff line number Diff line
@@ -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) {

include/linux/can/platform/mcp251x.h

+0 −2
Original line number Diff line number Diff line
@@ -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__ */