[PATCH v7 3/8] can: m_can: Remove check for version when allocating m_can net device
From: Faiz Abbas <hidden>
Date: 2018-01-10 10:57:40
Also in:
linux-can, linux-devicetree, linux-omap, lkml
Subsystem:
can network drivers, mcan device driver, the rest · Maintainers:
Marc Kleine-Budde, Vincent Mailhol, Markus Schneider-Pargmann, Linus Torvalds
Currently the m_can version is used to set the tx_fifo_count to 1 when allocating the net device. However, this is redundant as a value of 1 for the tx_fifo_count needs to be provided in the bosch,mram-cfg property of the device tree node anyway. Therefore, remove check for version when allocating the net device. Signed-off-by: Faiz Abbas <redacted> --- drivers/net/can/m_can/m_can.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index f72116e..893edbb 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c@@ -1213,7 +1213,6 @@ static struct net_device *alloc_m_can_dev(struct platform_device *pdev, struct net_device *dev; struct m_can_priv *priv; int m_can_version; - unsigned int echo_buffer_count; m_can_version = m_can_check_core_release(addr); /* return if unsupported version */
@@ -1222,12 +1221,7 @@ static struct net_device *alloc_m_can_dev(struct platform_device *pdev, goto return_dev; } - /* If version < 3.1.x, then only one echo buffer is used */ - echo_buffer_count = ((m_can_version == 30) - ? 1U - : (unsigned int)tx_fifo_size); - - dev = alloc_candev(sizeof(*priv), echo_buffer_count); + dev = alloc_candev(sizeof(*priv), tx_fifo_size); if (!dev) { dev = NULL; goto return_dev;
--
2.7.4