[PATCH net 1/2] Revert "net: txgbe: fix i2c dev name cannot match clkdev"

[PATCH net 1/2] Revert "net: txgbe: fix i2c dev name cannot match clkdev"

[Duanqiang Wen]

This reverts commit c644920ce9220d83e070f575a4df711741c07f07.
when register i2c dev, txgbe shorten "i2c_designware" to "i2c_dw",
will cause this i2c dev can't match platfom driver i2c_designware_platform.

Signed-off-by: Duanqiang Wen <duanqiangwen@net-swift.com>
---
 drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
index 2fa511227eac..5b5d5e4310d1 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
@@ -20,8 +20,6 @@
 #include "txgbe_phy.h"
 #include "txgbe_hw.h"
 
-#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
-
 static int txgbe_swnodes_register(struct txgbe *txgbe)
 {
 	struct txgbe_nodes *nodes = &txgbe->nodes;
@@ -573,8 +571,8 @@ static int txgbe_clock_register(struct txgbe *txgbe)
 	char clk_name[32];
 	struct clk *clk;
 
-	snprintf(clk_name, sizeof(clk_name), "%s.%d",
-		 TXGBE_I2C_CLK_DEV_NAME, pci_dev_id(pdev));
+	snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
+		 pci_dev_id(pdev));
 
 	clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);
 	if (IS_ERR(clk))
@@ -636,7 +634,7 @@ static int txgbe_i2c_register(struct txgbe *txgbe)
 
 	info.parent = &pdev->dev;
 	info.fwnode = software_node_fwnode(txgbe->nodes.group[SWNODE_I2C]);
-	info.name = TXGBE_I2C_CLK_DEV_NAME;
+	info.name = "i2c_designware";
 	info.id = pci_dev_id(pdev);
 
 	info.res = &DEFINE_RES_IRQ(pdev->irq);
-- 
2.27.0

[PATCH net 2/2] Revert "net: txgbe: fix clk_name exceed MAX_DEV_ID limits"

[Duanqiang Wen]

This reverts commit e30cef001da259e8df354b813015d0e5acc08740.
commit 99f4570cfba1 ("clkdev: Update clkdev id usage to allow
for longer names") can fix clk_name exceed MAX_DEV_ID limits,
so this commit is meaningless.

Signed-off-by: Duanqiang Wen <duanqiangwen@net-swift.com>
---
 drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
index 5b5d5e4310d1..93295916b1d2 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
@@ -571,7 +571,7 @@ static int txgbe_clock_register(struct txgbe *txgbe)
 	char clk_name[32];
 	struct clk *clk;
 
-	snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
+	snprintf(clk_name, sizeof(clk_name), "i2c_designware.%d",
 		 pci_dev_id(pdev));
 
 	clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);
-- 
2.27.0

Re: [PATCH net 2/2] Revert "net: txgbe: fix clk_name exceed MAX_DEV_ID limits"

[Jacob Keller]

On 4/22/2024 1:41 AM, Duanqiang Wen wrote:
> This reverts commit e30cef001da259e8df354b813015d0e5acc08740.
> commit 99f4570cfba1 ("clkdev: Update clkdev id usage to allow
> for longer names") can fix clk_name exceed MAX_DEV_ID limits,
> so this commit is meaningless.
> 

The fix for longer names only adds 4 bytes, so it does fix this
particular case but doesn't necessarily resolve from having a future
issue if another name gets a bit longer.

Still, it makes sense to keep the original name now that it fits.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>

> Signed-off-by: Duanqiang Wen <duanqiangwen@net-swift.com>
> ---
>  drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> index 5b5d5e4310d1..93295916b1d2 100644
> --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> @@ -571,7 +571,7 @@ static int txgbe_clock_register(struct txgbe *txgbe)
>  	char clk_name[32];
>  	struct clk *clk;
>  
> -	snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
> +	snprintf(clk_name, sizeof(clk_name), "i2c_designware.%d",
>  		 pci_dev_id(pdev));
>  
>  	clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);

Re: [PATCH net 1/2] Revert "net: txgbe: fix i2c dev name cannot match clkdev"

[Jacob Keller]

On 4/22/2024 1:41 AM, Duanqiang Wen wrote:
> This reverts commit c644920ce9220d83e070f575a4df711741c07f07.
> when register i2c dev, txgbe shorten "i2c_designware" to "i2c_dw",
> will cause this i2c dev can't match platfom driver i2c_designware_platform.
> 

Makes sense. This name is used in other places so keeping the original
name is important.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>

> Signed-off-by: Duanqiang Wen <duanqiangwen@net-swift.com>
> ---
>  drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> index 2fa511227eac..5b5d5e4310d1 100644
> --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> @@ -20,8 +20,6 @@
>  #include "txgbe_phy.h"
>  #include "txgbe_hw.h"
>  
> -#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
> -
>  static int txgbe_swnodes_register(struct txgbe *txgbe)
>  {
>  	struct txgbe_nodes *nodes = &txgbe->nodes;
> @@ -573,8 +571,8 @@ static int txgbe_clock_register(struct txgbe *txgbe)
>  	char clk_name[32];
>  	struct clk *clk;
>  
> -	snprintf(clk_name, sizeof(clk_name), "%s.%d",
> -		 TXGBE_I2C_CLK_DEV_NAME, pci_dev_id(pdev));
> +	snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
> +		 pci_dev_id(pdev));
>  
>  	clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);
>  	if (IS_ERR(clk))
> @@ -636,7 +634,7 @@ static int txgbe_i2c_register(struct txgbe *txgbe)
>  
>  	info.parent = &pdev->dev;
>  	info.fwnode = software_node_fwnode(txgbe->nodes.group[SWNODE_I2C]);
> -	info.name = TXGBE_I2C_CLK_DEV_NAME;
> +	info.name = "i2c_designware";
>  	info.id = pci_dev_id(pdev);
>  
>  	info.res = &DEFINE_RES_IRQ(pdev->irq);

Re: [PATCH net 1/2] Revert "net: txgbe: fix i2c dev name cannot match clkdev"

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 22 Apr 2024 16:41:08 +0800 you wrote:
> This reverts commit c644920ce9220d83e070f575a4df711741c07f07.
> when register i2c dev, txgbe shorten "i2c_designware" to "i2c_dw",
> will cause this i2c dev can't match platfom driver i2c_designware_platform.
> 
> Signed-off-by: Duanqiang Wen <duanqiangwen@net-swift.com>
> ---
>  drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)

Here is the summary with links:
  - [net,1/2] Revert "net: txgbe: fix i2c dev name cannot match clkdev"
    https://git.kernel.org/netdev/net/c/8d6bf83f6740
  - [net,2/2] Revert "net: txgbe: fix clk_name exceed MAX_DEV_ID limits"
    https://git.kernel.org/netdev/net/c/edd2d250fb3b

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html