* [PATCH net-next 0/9] pull-request: can-next 2022-05-02
@ 2022-05-02 7:59 Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 1/9] dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support Marc Kleine-Budde
` (8 more replies)
0 siblings, 9 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel
Hello Jakub, hello David,
this is a pull request of 9 patches for net-next/master.
The first patch is by Biju Das and documents renesas,r9a07g043-canfd
support in the renesas,rcar-canfd bindings document.
Jakub Kicinski's patch removes a copy of the NAPI_POLL_WEIGHT define
from the m_can driver.
The last 7 patches all target the ctucanfd driver. Pavel Pisa provides
2 patch which update the documentation. 2 patches by Jiapeng Chong
remove unneeded includes and error messages. And another 3 patches by
Pavel Pisa to further clean up the driver (remove inline keyword,
remove unneeded debug statements, and remove unneeded module parameters).
regards,
Marc
---
The following changes since commit 6e28f56c0d1d976a4940d13d7f27e446ce65cd0a:
Merge branch 'adin1100-industrial-PHY-support' (2022-05-01 17:45:35 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.19-20220502
for you to fetch changes up to 28b250e070e9a45a814d13c4ae756aab1298ff27:
can: ctucanfd: remove PCI module debug parameters (2022-05-02 09:24:41 +0200)
----------------------------------------------------------------
linux-can-next-for-5.19-20220502
----------------------------------------------------------------
Biju Das (1):
dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support
Jakub Kicinski (1):
can: m_can: remove a copy of the NAPI_POLL_WEIGHT define
Jiapeng Chong (2):
can: ctucanfd: remove unused including <linux/version.h>
can: ctucanfd: ctucan_platform_probe(): remove unnecessary print function dev_err()
Pavel Pisa (5):
docs: networking: device drivers: can: add ctucanfd to index
docs: networking: device drivers: can: ctucanfd: update author e-mail
can: ctucanfd: remove inline keyword from local static functions
can: ctucanfd: remove debug statements
can: ctucanfd: remove PCI module debug parameters
.../bindings/net/can/renesas,rcar-canfd.yaml | 1 +
.../device_drivers/can/ctu/ctucanfd-driver.rst | 2 +-
.../networking/device_drivers/can/index.rst | 1 +
drivers/net/can/ctucanfd/ctucanfd_base.c | 34 ++--------------------
drivers/net/can/ctucanfd/ctucanfd_pci.c | 22 ++++----------
drivers/net/can/ctucanfd/ctucanfd_platform.c | 1 -
drivers/net/can/m_can/m_can.c | 9 ++----
7 files changed, 15 insertions(+), 55 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH net-next 1/9] dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
2022-05-02 11:20 ` patchwork-bot+netdevbpf
2022-05-02 7:59 ` [PATCH net-next 2/9] can: m_can: remove a copy of the NAPI_POLL_WEIGHT define Marc Kleine-Budde
` (7 subsequent siblings)
8 siblings, 1 reply; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, linux-can, kernel, Biju Das, Krzysztof Kozlowski,
Geert Uytterhoeven, Marc Kleine-Budde
From: Biju Das <biju.das.jz@bp.renesas.com>
Add CANFD binding documentation for Renesas R9A07G043 (RZ/G2UL) SoC.
Link: https://lore.kernel.org/all/20220423130743.123198-1-biju.das.jz@bp.renesas.com
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
.../devicetree/bindings/net/can/renesas,rcar-canfd.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml b/Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml
index 648740270731..9fc137fafed9 100644
--- a/Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml
+++ b/Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml
@@ -33,6 +33,7 @@ properties:
- items:
- enum:
+ - renesas,r9a07g043-canfd # RZ/G2UL
- renesas,r9a07g044-canfd # RZ/G2{L,LC}
- renesas,r9a07g054-canfd # RZ/V2L
- const: renesas,rzg2l-canfd # RZ/G2L family
base-commit: 6e28f56c0d1d976a4940d13d7f27e446ce65cd0a
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 2/9] can: m_can: remove a copy of the NAPI_POLL_WEIGHT define
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 1/9] dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 3/9] docs: networking: device drivers: can: add ctucanfd to index Marc Kleine-Budde
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Marc Kleine-Budde
From: Jakub Kicinski <kuba@kernel.org>
Defining local versions of NAPI_POLL_WEIGHT with the same values in
the drivers just makes refactoring harder.
Link: https://lore.kernel.org/all/20220429174446.196655-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/m_can.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 2779bba390f2..e6d2da4a9f41 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -77,9 +77,6 @@ enum m_can_reg {
M_CAN_TXEFA = 0xf8,
};
-/* napi related */
-#define M_CAN_NAPI_WEIGHT 64
-
/* message ram configuration data length */
#define MRAM_CFG_LEN 8
@@ -951,7 +948,7 @@ static int m_can_rx_peripheral(struct net_device *dev)
struct m_can_classdev *cdev = netdev_priv(dev);
int work_done;
- work_done = m_can_rx_handler(dev, M_CAN_NAPI_WEIGHT);
+ work_done = m_can_rx_handler(dev, NAPI_POLL_WEIGHT);
/* Don't re-enable interrupts if the driver had a fatal error
* (e.g., FIFO read failure).
@@ -1474,7 +1471,7 @@ static int m_can_dev_setup(struct m_can_classdev *cdev)
if (!cdev->is_peripheral)
netif_napi_add(dev, &cdev->napi,
- m_can_poll, M_CAN_NAPI_WEIGHT);
+ m_can_poll, NAPI_POLL_WEIGHT);
/* Shared properties of all M_CAN versions */
cdev->version = m_can_version;
@@ -1994,7 +1991,7 @@ int m_can_class_register(struct m_can_classdev *cdev)
if (cdev->is_peripheral) {
ret = can_rx_offload_add_manual(cdev->net, &cdev->offload,
- M_CAN_NAPI_WEIGHT);
+ NAPI_POLL_WEIGHT);
if (ret)
goto clk_disable;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 3/9] docs: networking: device drivers: can: add ctucanfd to index
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 1/9] dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 2/9] can: m_can: remove a copy of the NAPI_POLL_WEIGHT define Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 4/9] docs: networking: device drivers: can: ctucanfd: update author e-mail Marc Kleine-Budde
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Pavel Pisa, Marc Kleine-Budde
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
This patch adds the ctucanfd-driver document to the index.
Link: https://lore.kernel.org/all/e4396244da6b008c671def9f50bb983a10389863.1650816929.git.pisa@cmp.felk.cvut.cz
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
[mkl: split into separate patches]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Documentation/networking/device_drivers/can/index.rst | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/networking/device_drivers/can/index.rst b/Documentation/networking/device_drivers/can/index.rst
index 58b6e0ad3030..0c3cc6633559 100644
--- a/Documentation/networking/device_drivers/can/index.rst
+++ b/Documentation/networking/device_drivers/can/index.rst
@@ -10,6 +10,7 @@ Contents:
.. toctree::
:maxdepth: 2
+ ctu/ctucanfd-driver
freescale/flexcan
.. only:: subproject and html
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 4/9] docs: networking: device drivers: can: ctucanfd: update author e-mail
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
` (2 preceding siblings ...)
2022-05-02 7:59 ` [PATCH net-next 3/9] docs: networking: device drivers: can: add ctucanfd to index Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 5/9] can: ctucanfd: remove unused including <linux/version.h> Marc Kleine-Budde
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, linux-can, kernel, Pavel Pisa, Odrej Ille,
Marc Kleine-Budde
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
This patch updates the author's email address.
Link: https://lore.kernel.org/all/e4396244da6b008c671def9f50bb983a10389863.1650816929.git.pisa@cmp.felk.cvut.cz
Cc: Odrej Ille <ondrej.ille@gmail.com>
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
[mkl: split into separate patches]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
.../networking/device_drivers/can/ctu/ctucanfd-driver.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst b/Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst
index 797fb45be187..2fde5551e756 100644
--- a/Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst
+++ b/Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst
@@ -536,7 +536,7 @@ CTU CAN FD Driver Sources Reference
CTU CAN FD IP Core and Driver Development Acknowledgment
---------------------------------------------------------
-* Odrej Ille <illeondr@fel.cvut.cz>
+* Odrej Ille <ondrej.ille@gmail.com>
* started the project as student at Department of Measurement, FEE, CTU
* invested great amount of personal time and enthusiasm to the project over years
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 5/9] can: ctucanfd: remove unused including <linux/version.h>
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
` (3 preceding siblings ...)
2022-05-02 7:59 ` [PATCH net-next 4/9] docs: networking: device drivers: can: ctucanfd: update author e-mail Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 6/9] can: ctucanfd: ctucan_platform_probe(): remove unnecessary print function dev_err() Marc Kleine-Budde
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, linux-can, kernel, Jiapeng Chong, Abaci Robot,
Pave Pisa, Marc Kleine-Budde
From: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Eliminate the follow versioncheck warning:
| drivers/net/can/ctucanfd/ctucanfd_base.c: 34 linux/version.h not needed.
Link: https://lore.kernel.org/all/20220421202852.2693-1-jiapeng.chong@linux.alibaba.com
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Acked-by: Pave Pisa <pisa@cmp.felk.cvut.cz>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ctucanfd/ctucanfd_base.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/can/ctucanfd/ctucanfd_base.c b/drivers/net/can/ctucanfd/ctucanfd_base.c
index 7a4550f60abb..be90136be442 100644
--- a/drivers/net/can/ctucanfd/ctucanfd_base.c
+++ b/drivers/net/can/ctucanfd/ctucanfd_base.c
@@ -31,7 +31,6 @@
#include <linux/can/error.h>
#include <linux/can/led.h>
#include <linux/pm_runtime.h>
-#include <linux/version.h>
#include "ctucanfd.h"
#include "ctucanfd_kregs.h"
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 6/9] can: ctucanfd: ctucan_platform_probe(): remove unnecessary print function dev_err()
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
` (4 preceding siblings ...)
2022-05-02 7:59 ` [PATCH net-next 5/9] can: ctucanfd: remove unused including <linux/version.h> Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 7/9] can: ctucanfd: remove inline keyword from local static functions Marc Kleine-Budde
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, linux-can, kernel, Jiapeng Chong, Abaci Robot,
Pave Pisa, Marc Kleine-Budde
From: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
The print function dev_err() is redundant because platform_get_irq()
already prints an error.
Eliminate the follow coccicheck warnings:
| drivers/net/can/ctucanfd/ctucanfd_platform.c:67:2-9:
| line 67 is redundant because platform_get_irq() already prints an error.
Link: https://lore.kernel.org/all/20220421203242.7335-1-jiapeng.chong@linux.alibaba.com
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Acked-by: Pave Pisa <pisa@cmp.felk.cvut.cz>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ctucanfd/ctucanfd_platform.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/can/ctucanfd/ctucanfd_platform.c b/drivers/net/can/ctucanfd/ctucanfd_platform.c
index 5e4806068662..89d54c2151e1 100644
--- a/drivers/net/can/ctucanfd/ctucanfd_platform.c
+++ b/drivers/net/can/ctucanfd/ctucanfd_platform.c
@@ -64,7 +64,6 @@ static int ctucan_platform_probe(struct platform_device *pdev)
}
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
- dev_err(dev, "Cannot find interrupt.\n");
ret = irq;
goto err;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 7/9] can: ctucanfd: remove inline keyword from local static functions
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
` (5 preceding siblings ...)
2022-05-02 7:59 ` [PATCH net-next 6/9] can: ctucanfd: ctucan_platform_probe(): remove unnecessary print function dev_err() Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 8/9] can: ctucanfd: remove debug statements Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 9/9] can: ctucanfd: remove PCI module debug parameters Marc Kleine-Budde
8 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Pavel Pisa, Marc Kleine-Budde
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
This patch removes the inline keywords from the local static functions
to make both checkpatch.pl and patchwork happy.
Link: https://lore.kernel.org/all/1fd684bcf5ddb0346aad234072f54e976a5210fb.1650816929.git.pisa@cmp.felk.cvut.cz
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
[mkl: split into separate patches]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ctucanfd/ctucanfd_base.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/ctucanfd/ctucanfd_base.c b/drivers/net/can/ctucanfd/ctucanfd_base.c
index be90136be442..10c2517a395b 100644
--- a/drivers/net/can/ctucanfd/ctucanfd_base.c
+++ b/drivers/net/can/ctucanfd/ctucanfd_base.c
@@ -132,13 +132,12 @@ static u32 ctucan_read32_be(struct ctucan_priv *priv,
return ioread32be(priv->mem_base + reg);
}
-static inline void ctucan_write32(struct ctucan_priv *priv, enum ctu_can_fd_can_registers reg,
- u32 val)
+static void ctucan_write32(struct ctucan_priv *priv, enum ctu_can_fd_can_registers reg, u32 val)
{
priv->write_reg(priv, reg, val);
}
-static inline u32 ctucan_read32(struct ctucan_priv *priv, enum ctu_can_fd_can_registers reg)
+static u32 ctucan_read32(struct ctucan_priv *priv, enum ctu_can_fd_can_registers reg)
{
return priv->read_reg(priv, reg);
}
@@ -485,7 +484,7 @@ static int ctucan_do_set_mode(struct net_device *ndev, enum can_mode mode)
*
* Return: Status of TXT buffer
*/
-static inline enum ctucan_txtb_status ctucan_get_tx_status(struct ctucan_priv *priv, u8 buf)
+static enum ctucan_txtb_status ctucan_get_tx_status(struct ctucan_priv *priv, u8 buf)
{
u32 tx_status = ctucan_read32(priv, CTUCANFD_TX_STATUS);
enum ctucan_txtb_status status = (tx_status >> (buf * 4)) & 0x7;
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 8/9] can: ctucanfd: remove debug statements
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
` (6 preceding siblings ...)
2022-05-02 7:59 ` [PATCH net-next 7/9] can: ctucanfd: remove inline keyword from local static functions Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 9/9] can: ctucanfd: remove PCI module debug parameters Marc Kleine-Budde
8 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Pavel Pisa, Marc Kleine-Budde
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
This patch removes the debug statements from the driver to make
checkpatch.pl and patchwork happy.
Link: https://lore.kernel.org/all/1fd684bcf5ddb0346aad234072f54e976a5210fb.1650816929.git.pisa@cmp.felk.cvut.cz
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
[mkl: split into separate patches]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ctucanfd/ctucanfd_base.c | 26 ------------------------
1 file changed, 26 deletions(-)
diff --git a/drivers/net/can/ctucanfd/ctucanfd_base.c b/drivers/net/can/ctucanfd/ctucanfd_base.c
index 10c2517a395b..2ada097d1ede 100644
--- a/drivers/net/can/ctucanfd/ctucanfd_base.c
+++ b/drivers/net/can/ctucanfd/ctucanfd_base.c
@@ -177,8 +177,6 @@ static int ctucan_reset(struct net_device *ndev)
struct ctucan_priv *priv = netdev_priv(ndev);
int i = 100;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
ctucan_write32(priv, CTUCANFD_MODE, REG_MODE_RST);
clear_bit(CTUCANFD_FLAG_RX_FFW_BUFFERED, &priv->drv_flags);
@@ -264,8 +262,6 @@ static int ctucan_set_bittiming(struct net_device *ndev)
struct ctucan_priv *priv = netdev_priv(ndev);
struct can_bittiming *bt = &priv->can.bittiming;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
/* Note that bt may be modified here */
return ctucan_set_btr(ndev, bt, true);
}
@@ -281,8 +277,6 @@ static int ctucan_set_data_bittiming(struct net_device *ndev)
struct ctucan_priv *priv = netdev_priv(ndev);
struct can_bittiming *dbt = &priv->can.data_bittiming;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
/* Note that dbt may be modified here */
return ctucan_set_btr(ndev, dbt, false);
}
@@ -300,8 +294,6 @@ static int ctucan_set_secondary_sample_point(struct net_device *ndev)
int ssp_offset = 0;
u32 ssp_cfg = 0; /* No SSP by default */
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
if (CTU_CAN_FD_ENABLED(priv)) {
netdev_err(ndev, "BUG! Cannot set SSP - CAN is enabled\n");
return -EPERM;
@@ -388,8 +380,6 @@ static int ctucan_chip_start(struct net_device *ndev)
int err;
struct can_ctrlmode mode;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
priv->txb_prio = 0x01234567;
priv->txb_head = 0;
priv->txb_tail = 0;
@@ -455,8 +445,6 @@ static int ctucan_do_set_mode(struct net_device *ndev, enum can_mode mode)
{
int ret;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
switch (mode) {
case CAN_MODE_START:
ret = ctucan_reset(ndev);
@@ -1121,8 +1109,6 @@ static irqreturn_t ctucan_interrupt(int irq, void *dev_id)
u32 imask;
int irq_loops;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
for (irq_loops = 0; irq_loops < 10000; irq_loops++) {
/* Get the interrupt status */
isr = ctucan_read32(priv, CTUCANFD_INT_STAT);
@@ -1196,8 +1182,6 @@ static void ctucan_chip_stop(struct net_device *ndev)
u32 mask = 0xffffffff;
u32 mode;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
/* Disable interrupts and disable CAN */
ctucan_write32(priv, CTUCANFD_INT_ENA_CLR, mask);
ctucan_write32(priv, CTUCANFD_INT_MASK_SET, mask);
@@ -1220,8 +1204,6 @@ static int ctucan_open(struct net_device *ndev)
struct ctucan_priv *priv = netdev_priv(ndev);
int ret;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
ret = pm_runtime_get_sync(priv->dev);
if (ret < 0) {
netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",
@@ -1281,8 +1263,6 @@ static int ctucan_close(struct net_device *ndev)
{
struct ctucan_priv *priv = netdev_priv(ndev);
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
netif_stop_queue(ndev);
napi_disable(&priv->napi);
ctucan_chip_stop(ndev);
@@ -1308,8 +1288,6 @@ static int ctucan_get_berr_counter(const struct net_device *ndev, struct can_ber
struct ctucan_priv *priv = netdev_priv(ndev);
int ret;
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
ret = pm_runtime_get_sync(priv->dev);
if (ret < 0) {
netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n", __func__, ret);
@@ -1335,8 +1313,6 @@ int ctucan_suspend(struct device *dev)
struct net_device *ndev = dev_get_drvdata(dev);
struct ctucan_priv *priv = netdev_priv(ndev);
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
if (netif_running(ndev)) {
netif_stop_queue(ndev);
netif_device_detach(ndev);
@@ -1353,8 +1329,6 @@ int ctucan_resume(struct device *dev)
struct net_device *ndev = dev_get_drvdata(dev);
struct ctucan_priv *priv = netdev_priv(ndev);
- ctucan_netdev_dbg(ndev, "%s\n", __func__);
-
priv->can.state = CAN_STATE_ERROR_ACTIVE;
if (netif_running(ndev)) {
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 9/9] can: ctucanfd: remove PCI module debug parameters
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
` (7 preceding siblings ...)
2022-05-02 7:59 ` [PATCH net-next 8/9] can: ctucanfd: remove debug statements Marc Kleine-Budde
@ 2022-05-02 7:59 ` Marc Kleine-Budde
8 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2022-05-02 7:59 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Pavel Pisa, Marc Kleine-Budde
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
This patch removes the PCI module debug parameters, which are not
needed anymore, to make both checkpatch.pl and patchwork happy.
Link: https://lore.kernel.org/all/1fd684bcf5ddb0346aad234072f54e976a5210fb.1650816929.git.pisa@cmp.felk.cvut.cz
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
[mkl: split into separate patches]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ctucanfd/ctucanfd_pci.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/drivers/net/can/ctucanfd/ctucanfd_pci.c b/drivers/net/can/ctucanfd/ctucanfd_pci.c
index c37a42480533..8f2956a8ae43 100644
--- a/drivers/net/can/ctucanfd/ctucanfd_pci.c
+++ b/drivers/net/can/ctucanfd/ctucanfd_pci.c
@@ -45,14 +45,6 @@
#define CTUCAN_WITHOUT_CTUCAN_ID 0
#define CTUCAN_WITH_CTUCAN_ID 1
-static bool use_msi = true;
-module_param(use_msi, bool, 0444);
-MODULE_PARM_DESC(use_msi, "PCIe implementation use MSI interrupts. Default: 1 (yes)");
-
-static bool pci_use_second = true;
-module_param(pci_use_second, bool, 0444);
-MODULE_PARM_DESC(pci_use_second, "Use the second CAN core on PCIe card. Default: 1 (yes)");
-
struct ctucan_pci_board_data {
void __iomem *bar0_base;
void __iomem *cra_base;
@@ -117,13 +109,11 @@ static int ctucan_pci_probe(struct pci_dev *pdev,
goto err_disable_device;
}
- if (use_msi) {
- ret = pci_enable_msi(pdev);
- if (!ret) {
- dev_info(dev, "MSI enabled\n");
- pci_set_master(pdev);
- msi_ok = 1;
- }
+ ret = pci_enable_msi(pdev);
+ if (!ret) {
+ dev_info(dev, "MSI enabled\n");
+ pci_set_master(pdev);
+ msi_ok = 1;
}
dev_info(dev, "ctucan BAR0 0x%08llx 0x%08llx\n",
@@ -184,7 +174,7 @@ static int ctucan_pci_probe(struct pci_dev *pdev,
core_i++;
- while (pci_use_second && (core_i < num_cores)) {
+ while (core_i < num_cores) {
addr += 0x4000;
ret = ctucan_probe_common(dev, addr, irq, ntxbufs, 100000000,
0, ctucan_pci_set_drvdata);
--
2.35.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH net-next 1/9] dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support
2022-05-02 7:59 ` [PATCH net-next 1/9] dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support Marc Kleine-Budde
@ 2022-05-02 11:20 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 11+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-05-02 11:20 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: netdev, davem, kuba, linux-can, kernel, biju.das.jz,
krzysztof.kozlowski, geert+renesas
Hello:
This series was applied to netdev/net-next.git (master)
by Marc Kleine-Budde <mkl@pengutronix.de>:
On Mon, 2 May 2022 09:59:06 +0200 you wrote:
> From: Biju Das <biju.das.jz@bp.renesas.com>
>
> Add CANFD binding documentation for Renesas R9A07G043 (RZ/G2UL) SoC.
>
> Link: https://lore.kernel.org/all/20220423130743.123198-1-biju.das.jz@bp.renesas.com
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>
> [...]
Here is the summary with links:
- [net-next,1/9] dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support
https://git.kernel.org/netdev/net-next/c/35a78bf20033
- [net-next,2/9] can: m_can: remove a copy of the NAPI_POLL_WEIGHT define
https://git.kernel.org/netdev/net-next/c/e1cf330fa28a
- [net-next,3/9] docs: networking: device drivers: can: add ctucanfd to index
https://git.kernel.org/netdev/net-next/c/5f02ecbe08d6
- [net-next,4/9] docs: networking: device drivers: can: ctucanfd: update author e-mail
https://git.kernel.org/netdev/net-next/c/75790ef3b796
- [net-next,5/9] can: ctucanfd: remove unused including <linux/version.h>
https://git.kernel.org/netdev/net-next/c/704fd1762045
- [net-next,6/9] can: ctucanfd: ctucan_platform_probe(): remove unnecessary print function dev_err()
https://git.kernel.org/netdev/net-next/c/e715d4459485
- [net-next,7/9] can: ctucanfd: remove inline keyword from local static functions
https://git.kernel.org/netdev/net-next/c/a51491ac6ed2
- [net-next,8/9] can: ctucanfd: remove debug statements
https://git.kernel.org/netdev/net-next/c/e391a0f7be61
- [net-next,9/9] can: ctucanfd: remove PCI module debug parameters
https://git.kernel.org/netdev/net-next/c/28b250e070e9
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-05-02 11:20 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-02 7:59 [PATCH net-next 0/9] pull-request: can-next 2022-05-02 Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 1/9] dt-bindings: can: renesas,rcar-canfd: Document RZ/G2UL support Marc Kleine-Budde
2022-05-02 11:20 ` patchwork-bot+netdevbpf
2022-05-02 7:59 ` [PATCH net-next 2/9] can: m_can: remove a copy of the NAPI_POLL_WEIGHT define Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 3/9] docs: networking: device drivers: can: add ctucanfd to index Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 4/9] docs: networking: device drivers: can: ctucanfd: update author e-mail Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 5/9] can: ctucanfd: remove unused including <linux/version.h> Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 6/9] can: ctucanfd: ctucan_platform_probe(): remove unnecessary print function dev_err() Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 7/9] can: ctucanfd: remove inline keyword from local static functions Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 8/9] can: ctucanfd: remove debug statements Marc Kleine-Budde
2022-05-02 7:59 ` [PATCH net-next 9/9] can: ctucanfd: remove PCI module debug parameters Marc Kleine-Budde
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.