Message ID | 20240914081821.209130-1-maxime.chevallier@bootlin.com (mailing list archive) |
---|---|
State | Accepted |
Commit | c209847b8974d2d5e784e3105d4683835673b18d |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] net: ethernet: fs_enet: Make the per clock optional | expand |
Le 14/09/2024 à 10:18, Maxime Chevallier a écrit : > Some platforms that use fs_enet don't have the PER register clock. This > optional dependency on the clock was incorrectly made mandatory when > switching to devm_ accessors. > > Reported-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Closes: https://lore.kernel.org/netdev/4e4defa9-ef2f-4ff1-95ca-6627c24db20c@wanadoo.fr/ > Fixes: c614acf6e8e1 ("net: ethernet: fs_enet: simplify clock handling with devm accessors") > Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> > --- > This patch fixes a commit in net-next. > > drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > index d300b01859a1..3425c4a6abcb 100644 > --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > @@ -895,7 +895,7 @@ static int fs_enet_probe(struct platform_device *ofdev) > * but require enable to succeed when a clock was specified/found, > * keep a reference to the clock upon successful acquisition > */ > - clk = devm_clk_get_enabled(&ofdev->dev, "per"); > + clk = devm_clk_get_optional_enabled(&ofdev->dev, "per"); > if (IS_ERR(clk)) > goto out_free_fpi; > Reviewed-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Thanks
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Sat, 14 Sep 2024 10:18:20 +0200 you wrote: > Some platforms that use fs_enet don't have the PER register clock. This > optional dependency on the clock was incorrectly made mandatory when > switching to devm_ accessors. > > Reported-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Closes: https://lore.kernel.org/netdev/4e4defa9-ef2f-4ff1-95ca-6627c24db20c@wanadoo.fr/ > Fixes: c614acf6e8e1 ("net: ethernet: fs_enet: simplify clock handling with devm accessors") > Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> > > [...] Here is the summary with links: - [net-next] net: ethernet: fs_enet: Make the per clock optional https://git.kernel.org/netdev/net-next/c/c209847b8974 You are awesome, thank you!
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c index d300b01859a1..3425c4a6abcb 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c @@ -895,7 +895,7 @@ static int fs_enet_probe(struct platform_device *ofdev) * but require enable to succeed when a clock was specified/found, * keep a reference to the clock upon successful acquisition */ - clk = devm_clk_get_enabled(&ofdev->dev, "per"); + clk = devm_clk_get_optional_enabled(&ofdev->dev, "per"); if (IS_ERR(clk)) goto out_free_fpi;
Some platforms that use fs_enet don't have the PER register clock. This optional dependency on the clock was incorrectly made mandatory when switching to devm_ accessors. Reported-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Closes: https://lore.kernel.org/netdev/4e4defa9-ef2f-4ff1-95ca-6627c24db20c@wanadoo.fr/ Fixes: c614acf6e8e1 ("net: ethernet: fs_enet: simplify clock handling with devm accessors") Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> --- This patch fixes a commit in net-next. drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)