Commit 1e8f1504 authored by Duanqiang Wen's avatar Duanqiang Wen
Browse files

Revert "net: txgbe: fix clk_name exceed MAX_DEV_ID limits" 

mainline inclusion
from mainline-v6.9-rc6
commit edd2d250fb3bb5d70419ae82c1f9dbb9684dffd3
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9IP8F
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=edd2d250fb3bb5d70419ae82c1f9dbb9684dffd3



---------------------------------------------------------

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: default avatarDuanqiang Wen <duanqiangwen@net-swift.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20240422084109.3201-2-duanqiangwen@net-swift.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6ad15494

drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,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);