[PATCH] media-device: Remove duplicated memset() in media_enum_entities()

[PATCH] media-device: Remove duplicated memset() in media_enum_entities()

[Salva Peiró]

After the zeroing the whole struct struct media_entity_desc u_ent,
it is no longer necessary to memset(0) its u_ent.name field.

Signed-off-by: Salva Peiró <speiro@ai2.upv.es>

To: Mauro Carvalho Chehab <m.chehab@samsung.com>
CC: linux-media@vger.kernel.org
CC: linux-kernel@vger.kernel.org
CC: linux-kernel@vger.kernel.org
CC: stable@kernel.org
---
 drivers/media/media-device.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 703560f..88c1606 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -106,8 +106,6 @@ static long media_device_enum_entities(struct media_device *mdev,
 	if (ent->name) {
 		strncpy(u_ent.name, ent->name, sizeof(u_ent.name));
 		u_ent.name[sizeof(u_ent.name) - 1] = '\0';
-	} else {
-		memset(u_ent.name, 0, sizeof(u_ent.name));
 	}
 	u_ent.type = ent->type;
 	u_ent.revision = ent->revision;
-- 
1.7.10.4

Re: [PATCH] media-device: Remove duplicated memset() in media_enum_entities()

[Joe Perches]

On Sat, 2014-06-07 at 16:41 +0200, Salva Peiró wrote:
> After the zeroing the whole struct struct media_entity_desc u_ent,
> it is no longer necessary to memset(0) its u_ent.name field.

trivia:

> diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
[]
> @@ -106,8 +106,6 @@ static long media_device_enum_entities(struct media_device *mdev,
>  	if (ent->name) {
>  		strncpy(u_ent.name, ent->name, sizeof(u_ent.name));
>  		u_ent.name[sizeof(u_ent.name) - 1] = '\0';

this could be strlcpy too.

Re: [PATCH] media-device: Remove duplicated memset() in media_enum_entities()

[Laurent Pinchart]

Hi Salva,

Thank you for the patch.

On Saturday 07 June 2014 16:41:44 Salva Peiró wrote:
> After the zeroing the whole struct struct media_entity_desc u_ent,
> it is no longer necessary to memset(0) its u_ent.name field.
> 
> Signed-off-by: Salva Peiró <speiro@ai2.upv.es>
> 
> To: Mauro Carvalho Chehab <m.chehab@samsung.com>
> CC: linux-media@vger.kernel.org
> CC: linux-kernel@vger.kernel.org
> CC: linux-kernel@vger.kernel.org
> CC: stable@kernel.org

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

and applied to my tree.

> ---
>  drivers/media/media-device.c |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
> index 703560f..88c1606 100644
> --- a/drivers/media/media-device.c
> +++ b/drivers/media/media-device.c
> @@ -106,8 +106,6 @@ static long media_device_enum_entities(struct
> media_device *mdev, if (ent->name) {
>  		strncpy(u_ent.name, ent->name, sizeof(u_ent.name));
>  		u_ent.name[sizeof(u_ent.name) - 1] = '\0';
> -	} else {
> -		memset(u_ent.name, 0, sizeof(u_ent.name));
>  	}
>  	u_ent.type = ent->type;
>  	u_ent.revision = ent->revision;

-- 
Regards,

Laurent Pinchart