Skip to contentSkip to conversation

r8169: remove optional size argument in calls to strscpy

PATCH Applied Heiner Kallweit 3 participants 3 messages Jan 24 – Jan 27

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 r8169: remove optional size argument in calls to strscpy

Minor simplification of the code by removing the optional size argument.

---
 drivers/net/ethernet/realtek/r8169_firmware.c | 2 +-
 drivers/net/ethernet/realtek/r8169_main.c     | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/ethernet/realtek/r8169_firmware.c +1 -1
index bf055078a85..6dff3d94793 100644
@@ -68,7 +68,7 @@ static bool rtl_fw_format_ok(struct rtl_fw *rtl_fw)
 		if (size > (fw->size - start) / FW_OPCODE_SIZE)
 			return false;
 
-		strscpy(rtl_fw->version, fw_info->version, RTL_VER_SIZE);
+		strscpy(rtl_fw->version, fw_info->version);
 
 		pa->code = (__le32 *)(fw->data + start);
 		pa->size = size;
drivers/net/ethernet/realtek/r8169_main.c +3 -4
index de5999cfadf..3075391853f 100644
@@ -1771,12 +1771,11 @@ static void rtl8169_get_drvinfo(struct net_device *dev,
 	struct rtl8169_private *tp = netdev_priv(dev);
 	struct rtl_fw *rtl_fw = tp->rtl_fw;
 
-	strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-	strscpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info));
+	strscpy(info->driver, KBUILD_MODNAME);
+	strscpy(info->bus_info, pci_name(tp->pci_dev));
 	BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version));
 	if (rtl_fw)
-		strscpy(info->fw_version, rtl_fw->version,
-			sizeof(info->fw_version));
+		strscpy(info->fw_version, rtl_fw->version);
 }
 
 static int rtl8169_get_regs_len(struct net_device *dev)
Signature · 1 line
2.52.0
#2 lore raw
In reply to Heiner Kallweit
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 7 lines · On Sat, 24 Jan 2026 22:30:15 +0100 you wrote:

Minor simplification of the code by removing the optional size argument.

---
 drivers/net/ethernet/realtek/r8169_firmware.c | 2 +-
 drivers/net/ethernet/realtek/r8169_main.c     | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

Here is the summary with links:
- [net-next] r8169: remove optional size argument in calls to strscpy

    https://git.kernel.org/netdev/net-next/c/3ccf393cdd09

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html