From: Markus Schneider-Pargmann <msp@baylibre.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>,
Chandrasekar Ramakrishnan <rcsekar@samsung.com>,
Wolfgang Grandegger <wg@grandegger.com>
Cc: Vincent MAILHOL <mailhol.vincent@wanadoo.fr>,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Markus Schneider-Pargmann <msp@baylibre.com>
Subject: [PATCH 03/18] can: m_can: Remove repeated check for is_peripheral
Date: Wed, 21 Dec 2022 16:25:22 +0100 [thread overview]
Message-ID: <20221221152537.751564-4-msp@baylibre.com> (raw)
In-Reply-To: <20221221152537.751564-1-msp@baylibre.com>
Merge both if-blocks to fix this.
Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
---
drivers/net/can/m_can/m_can.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index f3ee21ce6109..a43abc667757 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1568,10 +1568,8 @@ static int m_can_close(struct net_device *dev)
cdev->tx_skb = NULL;
destroy_workqueue(cdev->tx_wq);
cdev->tx_wq = NULL;
- }
-
- if (cdev->is_peripheral)
can_rx_offload_disable(&cdev->offload);
+ }
close_candev(dev);
--
2.38.1
next prev parent reply other threads:[~2022-12-21 15:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 15:25 [PATCH 00/18] can: m_can: Optimizations for m_can/tcan part 2 Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 01/18] can: tcan4x5x: Remove reserved register 0x814 from writable table Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 02/18] can: tcan4x5x: Check size of mram configuration Markus Schneider-Pargmann
2022-12-21 15:25 ` Markus Schneider-Pargmann [this message]
2022-12-21 15:25 ` [PATCH 04/18] can: m_can: Always acknowledge all interrupts Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 05/18] can: m_can: Remove double interrupt enable Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 06/18] can: m_can: Disable unused interrupts Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 07/18] can: m_can: Keep interrupts enabled during peripheral read Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 08/18] can: m_can: Write transmit header and data in one transaction Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 09/18] can: m_can: Implement receive coalescing Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 10/18] can: m_can: Implement transmit coalescing Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 11/18] can: m_can: Add rx coalescing ethtool support Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 12/18] can: m_can: Add tx " Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 13/18] can: m_can: Cache tx putidx Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 14/18] can: m_can: Use the workqueue as queue Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 15/18] can: m_can: Introduce a tx_fifo_in_flight counter Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 16/18] can: m_can: Use tx_fifo_in_flight for netif_queue control Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 17/18] can: m_can: Implement BQL Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 18/18] can: m_can: Implement transmit submission coalescing Markus Schneider-Pargmann
2023-01-09 13:55 ` [PATCH 00/18] can: m_can: Optimizations for m_can/tcan part 2 Markus Schneider-Pargmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221221152537.751564-4-msp@baylibre.com \
--to=msp@baylibre.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=rcsekar@samsung.com \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).