| Message ID | 20220312224140.4173930-1-michael@walle.cc (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0f8946ae704ac6880c590beb91bc3a732595a28a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: mdio: mscc-miim: fix duplicate debugfs entry | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net |
| netdev/fixes_present | success | Fixes tag present in non-next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Single patches do not need cover letters |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | warning | WARNING: line length of 81 exceeds 80 columns |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Sat, Mar 12, 2022 at 11:41:40PM +0100, Michael Walle wrote: > This driver can have up to two regmaps. If the second one is registered > its debugfs entry will have the same name as the first one and the > following error will be printed: > > [ 3.833521] debugfs: Directory 'e200413c.mdio' with parent 'regmap' already present! > > Give the second regmap a name to avoid this. > > Fixes: a27a76282837 ("net: mdio: mscc-miim: convert to a regmap implementation") > Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Sat, 12 Mar 2022 23:41:40 +0100 you wrote: > This driver can have up to two regmaps. If the second one is registered > its debugfs entry will have the same name as the first one and the > following error will be printed: > > [ 3.833521] debugfs: Directory 'e200413c.mdio' with parent 'regmap' already present! > > Give the second regmap a name to avoid this. > > [...] Here is the summary with links: - [net] net: mdio: mscc-miim: fix duplicate debugfs entry https://git.kernel.org/netdev/net/c/0f8946ae704a You are awesome, thank you!
diff --git a/drivers/net/mdio/mdio-mscc-miim.c b/drivers/net/mdio/mdio-mscc-miim.c index dfd7f3001a15..fc5655328b1f 100644 --- a/drivers/net/mdio/mdio-mscc-miim.c +++ b/drivers/net/mdio/mdio-mscc-miim.c @@ -197,6 +197,13 @@ static const struct regmap_config mscc_miim_regmap_config = { .reg_stride = 4, }; +static const struct regmap_config mscc_miim_phy_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .name = "phy", +}; + int mscc_miim_setup(struct device *dev, struct mii_bus **pbus, const char *name, struct regmap *mii_regmap, int status_offset) { @@ -260,7 +267,7 @@ static int mscc_miim_probe(struct platform_device *pdev) } phy_regmap = devm_regmap_init_mmio(&pdev->dev, phy_regs, - &mscc_miim_regmap_config); + &mscc_miim_phy_regmap_config); if (IS_ERR(phy_regmap)) { dev_err(&pdev->dev, "Unable to create phy register regmap\n"); return PTR_ERR(phy_regmap);
This driver can have up to two regmaps. If the second one is registered its debugfs entry will have the same name as the first one and the following error will be printed: [ 3.833521] debugfs: Directory 'e200413c.mdio' with parent 'regmap' already present! Give the second regmap a name to avoid this. Fixes: a27a76282837 ("net: mdio: mscc-miim: convert to a regmap implementation") Signed-off-by: Michael Walle <michael@walle.cc> --- drivers/net/mdio/mdio-mscc-miim.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)