diff mbox

fix format mismatch in drivers/net/ethernet/intel/i40e/i40e_debugfs.c

Message ID 1400501090-315-1-git-send-email-toralf.foerster@gmx.de
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Toralf Förster May 19, 2014, 12:04 p.m. UTC
spotted by cppcheck

Signed-off-by: Toralf Förster <toralf.foerster@gmx.de>
---
 drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Kirsher, Jeffrey T May 20, 2014, 12:08 a.m. UTC | #1
On Mon, 2014-05-19 at 14:04 +0200, Toralf Förster wrote:
> spotted by cppcheck
> 
> Signed-off-by: Toralf Förster <toralf.foerster@gmx.de>
> ---
>  drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

I will add your patch to my queue and will hold off on making my
suggested change below until Shannon and Jesse have had time to review
your patch.

> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
> index 3c37386..1bc35a2 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
> @@ -1239,7 +1239,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
>  	} else if (strncmp(cmd_buf, "add pvid", 8) == 0) {
>  		i40e_status ret;
>  		u16 vid;
> -		int v;
> +		unsigned int v;

Maybe u16 instead...

>  
>  		cnt = sscanf(&cmd_buf[8], "%i %u", &vsi_seid, &v);
>  		if (cnt != 2) {
> @@ -1255,7 +1255,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
>  			goto command_write_done;
>  		}
>  
> -		vid = (unsigned)v;
> +		vid = v;
>  		ret = i40e_vsi_add_pvid(vsi, vid);
>  		if (!ret)
>  			dev_info(&pf->pdev->dev,
Shannon Nelson May 20, 2014, 12:17 a.m. UTC | #2
> From: Kirsher, Jeffrey T

> 

> On Mon, 2014-05-19 at 14:04 +0200, Toralf Förster wrote:

> > spotted by cppcheck

> >

> > Signed-off-by: Toralf Förster <toralf.foerster@gmx.de>

> > ---

> >  drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 ++--

> >  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> I will add your patch to my queue and will hold off on making my

> suggested change below until Shannon and Jesse have had time to review

> your patch.

> 

> >

> > diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c

> b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c

> > index 3c37386..1bc35a2 100644

> > --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c

> > +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c

> > @@ -1239,7 +1239,7 @@ static ssize_t i40e_dbg_command_write(struct

> file *filp,

> >  	} else if (strncmp(cmd_buf, "add pvid", 8) == 0) {

> >  		i40e_status ret;

> >  		u16 vid;

> > -		int v;

> > +		unsigned int v;

> 

> Maybe u16 instead...


sscanf() can be a tricksie little beastie, and I'm more comfortable with giving it an int of some sort rather than a u16, otherwise this would have just used vid from the start.  I can live with Toralf's suggestion.

sln


> 

> >

> >  		cnt = sscanf(&cmd_buf[8], "%i %u", &vsi_seid, &v);

> >  		if (cnt != 2) {

> > @@ -1255,7 +1255,7 @@ static ssize_t i40e_dbg_command_write(struct

> file *filp,

> >  			goto command_write_done;

> >  		}

> >

> > -		vid = (unsigned)v;

> > +		vid = v;

> >  		ret = i40e_vsi_add_pvid(vsi, vid);

> >  		if (!ret)

> >  			dev_info(&pf->pdev->dev,

>
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index 3c37386..1bc35a2 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -1239,7 +1239,7 @@  static ssize_t i40e_dbg_command_write(struct file *filp,
 	} else if (strncmp(cmd_buf, "add pvid", 8) == 0) {
 		i40e_status ret;
 		u16 vid;
-		int v;
+		unsigned int v;
 
 		cnt = sscanf(&cmd_buf[8], "%i %u", &vsi_seid, &v);
 		if (cnt != 2) {
@@ -1255,7 +1255,7 @@  static ssize_t i40e_dbg_command_write(struct file *filp,
 			goto command_write_done;
 		}
 
-		vid = (unsigned)v;
+		vid = v;
 		ret = i40e_vsi_add_pvid(vsi, vid);
 		if (!ret)
 			dev_info(&pf->pdev->dev,