* pull-request: can-next 2021-08-25
@ 2021-08-25 9:35 Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 1/4] can: rcar: Kconfig: Add helper dependency on COMPILE_TEST Marc Kleine-Budde
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2021-08-25 9:35 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel
Hello Jakub, hello David,
this is a pull request of 4 patches for net-next/master.
The first patch is by Cai Huoqing, and enables COMPILE_TEST for the
rcar CAN drivers.
Lad Prabhakar contributes a patch for the rcar_canfd driver, fixing a
redundant assignment.
The last 2 patches are by Tang Bin, target the mscan driver, and clean
up the driver by converting it to of_device_get_match_data() and
removing a useless BUG_ON.
regards,
Marc
---
The following changes since commit a37c5c26693eadb3aa4101d8fe955e40d206b386:
net: bridge: change return type of br_handle_ingress_vlan_tunnel (2021-08-24 16:51:09 -0700)
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.15-20210825
for you to fetch changes up to cbe8cd7d83e251bff134a57ea4b6378db992ad82:
can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): remove useless BUG_ON() (2021-08-25 08:25:11 +0200)
----------------------------------------------------------------
linux-can-next-for-5.15-20210825
----------------------------------------------------------------
Cai Huoqing (1):
can: rcar: Kconfig: Add helper dependency on COMPILE_TEST
Lad Prabhakar (1):
can: rcar_canfd: rcar_canfd_handle_channel_tx(): fix redundant assignment
Tang Bin (2):
can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): use of_device_get_match_data to simplify code
can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): remove useless BUG_ON()
drivers/net/can/mscan/mpc5xxx_can.c | 7 ++-----
drivers/net/can/rcar/Kconfig | 4 ++--
drivers/net/can/rcar/rcar_canfd.c | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 1/4] can: rcar: Kconfig: Add helper dependency on COMPILE_TEST
2021-08-25 9:35 pull-request: can-next 2021-08-25 Marc Kleine-Budde
@ 2021-08-25 9:35 ` Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 2/4] can: rcar_canfd: rcar_canfd_handle_channel_tx(): fix redundant assignment Marc Kleine-Budde
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2021-08-25 9:35 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Cai Huoqing, Marc Kleine-Budde
From: Cai Huoqing <caihuoqing@baidu.com>
it's helpful for complie test in other platform(e.g.X86)
Link: https://lore.kernel.org/r/20210825062341.2332-1-caihuoqing@baidu.com
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/rcar/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/rcar/Kconfig b/drivers/net/can/rcar/Kconfig
index 29cabc20109e..56320a7f828b 100644
--- a/drivers/net/can/rcar/Kconfig
+++ b/drivers/net/can/rcar/Kconfig
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
config CAN_RCAR
tristate "Renesas R-Car and RZ/G CAN controller"
- depends on ARCH_RENESAS || ARM
+ depends on ARCH_RENESAS || ARM || COMPILE_TEST
help
Say Y here if you want to use CAN controller found on Renesas R-Car
or RZ/G SoCs.
@@ -11,7 +11,7 @@ config CAN_RCAR
config CAN_RCAR_CANFD
tristate "Renesas R-Car CAN FD controller"
- depends on ARCH_RENESAS || ARM
+ depends on ARCH_RENESAS || ARM || COMPILE_TEST
help
Say Y here if you want to use CAN FD controller found on
Renesas R-Car SoCs. The driver puts the controller in CAN FD only
base-commit: a37c5c26693eadb3aa4101d8fe955e40d206b386
--
2.32.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 2/4] can: rcar_canfd: rcar_canfd_handle_channel_tx(): fix redundant assignment
2021-08-25 9:35 pull-request: can-next 2021-08-25 Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 1/4] can: rcar: Kconfig: Add helper dependency on COMPILE_TEST Marc Kleine-Budde
@ 2021-08-25 9:35 ` Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 3/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): use of_device_get_match_data to simplify code Marc Kleine-Budde
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2021-08-25 9:35 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, linux-can, kernel, Lad Prabhakar, kernel test robot,
Marc Kleine-Budde
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Fix redundant assignment of 'priv' to itself in
rcar_canfd_handle_channel_tx().
Fixes: 76e9353a80e9 ("can: rcar_canfd: Add support for RZ/G2L family")
Link: https://lore.kernel.org/r/20210820161449.18169-1-prabhakar.mahadev-lad.rj@bp.renesas.com
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/rcar/rcar_canfd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 5d4d52afde15..c47988d3674e 100644
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -1182,7 +1182,7 @@ static void rcar_canfd_state_change(struct net_device *ndev,
static void rcar_canfd_handle_channel_tx(struct rcar_canfd_global *gpriv, u32 ch)
{
- struct rcar_canfd_channel *priv = priv = gpriv->ch[ch];
+ struct rcar_canfd_channel *priv = gpriv->ch[ch];
struct net_device *ndev = priv->ndev;
u32 sts;
--
2.32.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 3/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): use of_device_get_match_data to simplify code
2021-08-25 9:35 pull-request: can-next 2021-08-25 Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 1/4] can: rcar: Kconfig: Add helper dependency on COMPILE_TEST Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 2/4] can: rcar_canfd: rcar_canfd_handle_channel_tx(): fix redundant assignment Marc Kleine-Budde
@ 2021-08-25 9:35 ` Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 4/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): remove useless BUG_ON() Marc Kleine-Budde
2021-08-25 10:30 ` pull-request: can-next 2021-08-25 patchwork-bot+netdevbpf
4 siblings, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2021-08-25 9:35 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Tang Bin, Marc Kleine-Budde
From: Tang Bin <tangbin@cmss.chinamobile.com>
Retrieve OF match data, it's better and cleaner to use
'of_device_get_match_data' over 'of_match_device'.
Link: https://lore.kernel.org/r/20210823113338.3568-4-tangbin@cmss.chinamobile.com
Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/mscan/mpc5xxx_can.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index e254e04ae257..3b7465acd35c 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -279,7 +279,6 @@ static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
static const struct of_device_id mpc5xxx_can_table[];
static int mpc5xxx_can_probe(struct platform_device *ofdev)
{
- const struct of_device_id *match;
const struct mpc5xxx_can_data *data;
struct device_node *np = ofdev->dev.of_node;
struct net_device *dev;
@@ -289,10 +288,9 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)
int irq, mscan_clksrc = 0;
int err = -ENOMEM;
- match = of_match_device(mpc5xxx_can_table, &ofdev->dev);
- if (!match)
+ data = of_device_get_match_data(&ofdev->dev);
+ if (!data)
return -EINVAL;
- data = match->data;
base = of_iomap(np, 0);
if (!base) {
--
2.32.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 4/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): remove useless BUG_ON()
2021-08-25 9:35 pull-request: can-next 2021-08-25 Marc Kleine-Budde
` (2 preceding siblings ...)
2021-08-25 9:35 ` [PATCH net-next 3/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): use of_device_get_match_data to simplify code Marc Kleine-Budde
@ 2021-08-25 9:35 ` Marc Kleine-Budde
2021-08-25 10:30 ` pull-request: can-next 2021-08-25 patchwork-bot+netdevbpf
4 siblings, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2021-08-25 9:35 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Tang Bin, Marc Kleine-Budde
From: Tang Bin <tangbin@cmss.chinamobile.com>
In the function mpc5xxx_can_probe(), the variable 'data' has already
been determined in the above code, so the BUG_ON() in this place is
useless, remove it.
Link: https://lore.kernel.org/r/20210823141033.17876-1-tangbin@cmss.chinamobile.com
Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/mscan/mpc5xxx_can.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 3b7465acd35c..35892c1efef0 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -317,7 +317,6 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)
clock_name = of_get_property(np, "fsl,mscan-clock-source", NULL);
- BUG_ON(!data);
priv->type = data->type;
priv->can.clock.freq = data->get_clock(ofdev, clock_name,
&mscan_clksrc);
--
2.32.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: pull-request: can-next 2021-08-25
2021-08-25 9:35 pull-request: can-next 2021-08-25 Marc Kleine-Budde
` (3 preceding siblings ...)
2021-08-25 9:35 ` [PATCH net-next 4/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): remove useless BUG_ON() Marc Kleine-Budde
@ 2021-08-25 10:30 ` patchwork-bot+netdevbpf
4 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-25 10:30 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: netdev, davem, kuba, linux-can, kernel
Hello:
This pull request was applied to netdev/net-next.git (refs/heads/master):
On Wed, 25 Aug 2021 11:35:12 +0200 you wrote:
> Hello Jakub, hello David,
>
> this is a pull request of 4 patches for net-next/master.
>
> The first patch is by Cai Huoqing, and enables COMPILE_TEST for the
> rcar CAN drivers.
>
> [...]
Here is the summary with links:
- pull-request: can-next 2021-08-25
https://git.kernel.org/netdev/net-next/c/45bc6125d142
- [net-next,2/4] can: rcar_canfd: rcar_canfd_handle_channel_tx(): fix redundant assignment
https://git.kernel.org/netdev/net-next/c/1d38ec497414
- [net-next,3/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): use of_device_get_match_data to simplify code
https://git.kernel.org/netdev/net-next/c/a4583c1deb1b
- [net-next,4/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): remove useless BUG_ON()
https://git.kernel.org/netdev/net-next/c/cbe8cd7d83e2
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] 6+ messages in thread
end of thread, other threads:[~2021-08-25 10:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-25 9:35 pull-request: can-next 2021-08-25 Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 1/4] can: rcar: Kconfig: Add helper dependency on COMPILE_TEST Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 2/4] can: rcar_canfd: rcar_canfd_handle_channel_tx(): fix redundant assignment Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 3/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): use of_device_get_match_data to simplify code Marc Kleine-Budde
2021-08-25 9:35 ` [PATCH net-next 4/4] can: mscan: mpc5xxx_can: mpc5xxx_can_probe(): remove useless BUG_ON() Marc Kleine-Budde
2021-08-25 10:30 ` pull-request: can-next 2021-08-25 patchwork-bot+netdevbpf
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.