[PATCH net-next 0/2] net: gve: make cleanup for gve

[PATCH net-next 0/2] net: gve: make cleanup for gve

[Daode Huang]

This patch set replace deprecated strlcpy by strscpy, remove
repeat word "allowed" in gve driver.
for more details, please refer to each patch.

Daode Huang (2):
  net: gve: convert strlcpy to strscpy
  net: gve: remove duplicated allowed

 drivers/net/ethernet/google/gve/gve_ethtool.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.8.1

[PATCH net-next 1/2] net: gve: convert strlcpy to strscpy

[Daode Huang]

Usage of strlcpy in linux kernel has been recently deprecated[1], so
convert gve driver to strscpy

[1] https://lore.kernel.org/lkml/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL
=V6A6G1oUZcprmknw@mail.gmail.com/

Signed-off-by: Daode Huang <huangdaode@huawei.com>
---
 drivers/net/ethernet/google/gve/gve_ethtool.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c
index 0901fa6..e40e052 100644
--- a/drivers/net/ethernet/google/gve/gve_ethtool.c
+++ b/drivers/net/ethernet/google/gve/gve_ethtool.c
@@ -14,9 +14,9 @@ static void gve_get_drvinfo(struct net_device *netdev,
 {
 	struct gve_priv *priv = netdev_priv(netdev);
 
-	strlcpy(info->driver, "gve", sizeof(info->driver));
-	strlcpy(info->version, gve_version_str, sizeof(info->version));
-	strlcpy(info->bus_info, pci_name(priv->pdev), sizeof(info->bus_info));
+	strscpy(info->driver, "gve", sizeof(info->driver));
+	strscpy(info->version, gve_version_str, sizeof(info->version));
+	strscpy(info->bus_info, pci_name(priv->pdev), sizeof(info->bus_info));
 }
 
 static void gve_set_msglevel(struct net_device *netdev, u32 value)
-- 
2.8.1

Re: [PATCH net-next 1/2] net: gve: convert strlcpy to strscpy

[Catherine Sullivan]

On Thu, Mar 25, 2021 at 1:01 AM Daode Huang <huangdaode@huawei.com> wrote:
>
> Usage of strlcpy in linux kernel has been recently deprecated[1], so
> convert gve driver to strscpy
>
> [1] https://lore.kernel.org/lkml/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL
> =V6A6G1oUZcprmknw@mail.gmail.com/
>
> Signed-off-by: Daode Huang <huangdaode@huawei.com>

Reviewed-by: Catherine Sullivan <csully@google.com>

> ---
>  drivers/net/ethernet/google/gve/gve_ethtool.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c
> index 0901fa6..e40e052 100644
> --- a/drivers/net/ethernet/google/gve/gve_ethtool.c
> +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c
> @@ -14,9 +14,9 @@ static void gve_get_drvinfo(struct net_device *netdev,
>  {
>         struct gve_priv *priv = netdev_priv(netdev);
>
> -       strlcpy(info->driver, "gve", sizeof(info->driver));
> -       strlcpy(info->version, gve_version_str, sizeof(info->version));
> -       strlcpy(info->bus_info, pci_name(priv->pdev), sizeof(info->bus_info));
> +       strscpy(info->driver, "gve", sizeof(info->driver));
> +       strscpy(info->version, gve_version_str, sizeof(info->version));
> +       strscpy(info->bus_info, pci_name(priv->pdev), sizeof(info->bus_info));
>  }
>
>  static void gve_set_msglevel(struct net_device *netdev, u32 value)
> --
> 2.8.1
>

[PATCH net-next 2/2] net: gve: remove duplicated allowed

[Daode Huang]

fix the WARNING of Possible repeated word: 'allowed'

Signed-off-by: Daode Huang <huangdaode@huawei.com>
---
 drivers/net/ethernet/google/gve/gve_ethtool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c
index e40e052..5fb05cf 100644
--- a/drivers/net/ethernet/google/gve/gve_ethtool.c
+++ b/drivers/net/ethernet/google/gve/gve_ethtool.c
@@ -388,7 +388,7 @@ static int gve_set_channels(struct net_device *netdev,
 
 	gve_get_channels(netdev, &old_settings);
 
-	/* Changing combined is not allowed allowed */
+	/* Changing combined is not allowed */
 	if (cmd->combined_count != old_settings.combined_count)
 		return -EINVAL;
 
-- 
2.8.1

Re: [PATCH net-next 2/2] net: gve: remove duplicated allowed

[Catherine Sullivan]

On Thu, Mar 25, 2021 at 1:00 AM Daode Huang <huangdaode@huawei.com> wrote:
>
> fix the WARNING of Possible repeated word: 'allowed'
>
> Signed-off-by: Daode Huang <huangdaode@huawei.com>

Reviewed-by: Catherine Sullivan <csully@google.com>

> ---
>  drivers/net/ethernet/google/gve/gve_ethtool.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c
> index e40e052..5fb05cf 100644
> --- a/drivers/net/ethernet/google/gve/gve_ethtool.c
> +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c
> @@ -388,7 +388,7 @@ static int gve_set_channels(struct net_device *netdev,
>
>         gve_get_channels(netdev, &old_settings);
>
> -       /* Changing combined is not allowed allowed */
> +       /* Changing combined is not allowed */
>         if (cmd->combined_count != old_settings.combined_count)
>                 return -EINVAL;
>
> --
> 2.8.1
>

Re: [PATCH net-next 0/2] net: gve: make cleanup for gve

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

On Thu, 25 Mar 2021 15:56:30 +0800 you wrote:
> This patch set replace deprecated strlcpy by strscpy, remove
> repeat word "allowed" in gve driver.
> for more details, please refer to each patch.
> 
> Daode Huang (2):
>   net: gve: convert strlcpy to strscpy
>   net: gve: remove duplicated allowed
> 
> [...]

Here is the summary with links:
  - [net-next,1/2] net: gve: convert strlcpy to strscpy
    https://git.kernel.org/netdev/net-next/c/c32773c96131
  - [net-next,2/2] net: gve: remove duplicated allowed
    https://git.kernel.org/netdev/net-next/c/f67435b555df

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