tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

net: ethernet: ti-cpsw:: rename soft_reset() function

While looking at the glob symbols shared between the cpsw drivers,
I noticed that soft_reset() is the only one that is missing a proper
namespace prefix, and will pollute the kernel namespace, so rename
it to be consistent with the other symbols.

Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20260402184726.3746487-1-arnd@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Arnd Bergmann and committed by
Jakub Kicinski 961f3c53 e6b7e1a1

+4 -4
+1 -1
drivers/net/ethernet/ti/cpsw.c
··· 706 706 struct cpsw_common *cpsw = priv->cpsw; 707 707 708 708 /* soft reset the controller and initialize ale */ 709 - soft_reset("cpsw", &cpsw->regs->soft_reset); 709 + cpsw_soft_reset("cpsw", &cpsw->regs->soft_reset); 710 710 cpsw_ale_start(cpsw->ale); 711 711 712 712 /* switch to vlan aware mode */
+1 -1
drivers/net/ethernet/ti/cpsw_new.c
··· 573 573 u32 control_reg; 574 574 575 575 /* soft reset the controller and initialize ale */ 576 - soft_reset("cpsw", &cpsw->regs->soft_reset); 576 + cpsw_soft_reset("cpsw", &cpsw->regs->soft_reset); 577 577 cpsw_ale_start(cpsw->ale); 578 578 579 579 /* switch to vlan aware mode */
+1 -1
drivers/net/ethernet/ti/cpsw_priv.c
··· 275 275 slave_write(slave, mac_lo(priv->mac_addr), SA_LO); 276 276 } 277 277 278 - void soft_reset(const char *module, void __iomem *reg) 278 + void cpsw_soft_reset(const char *module, void __iomem *reg) 279 279 { 280 280 unsigned long timeout = jiffies + HZ; 281 281
+1 -1
drivers/net/ethernet/ti/cpsw_priv.h
··· 458 458 int cpsw_rx_mq_poll(struct napi_struct *napi_rx, int budget); 459 459 int cpsw_rx_poll(struct napi_struct *napi_rx, int budget); 460 460 void cpsw_rx_vlan_encap(struct sk_buff *skb); 461 - void soft_reset(const char *module, void __iomem *reg); 461 + void cpsw_soft_reset(const char *module, void __iomem *reg); 462 462 void cpsw_set_slave_mac(struct cpsw_slave *slave, struct cpsw_priv *priv); 463 463 void cpsw_ndo_tx_timeout(struct net_device *ndev, unsigned int txqueue); 464 464 int cpsw_need_resplit(struct cpsw_common *cpsw);