Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48059784 authored by Fuqian Huang's avatar Fuqian Huang Committed by Mauro Carvalho Chehab
Browse files

media: media/tuners: Use kmemdup rather than duplicating its implementation 



kmemdup is introduced to duplicate a region of memory in a neat way.
Rather than kmalloc/kzalloc + memcpy, which the programmer needs to
write the size twice (sometimes lead to mistakes), kmemdup improves
readability, leads to smaller code and also reduce the chances of mistakes.
Suggestion to use kmemdup rather than using kmalloc/kzalloc + memcpy.

Signed-off-by: default avatarFuqian Huang <huangfq.daxian@gmail.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 771560e5

drivers/media/tuners/tuner-xc2028.c

+1 −2
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int load_all_firmwares(struct dvb_frontend *fe, 
			goto corrupt;

		}



		priv->firm[n].ptr = kzalloc(size, GFP_KERNEL);

		priv->firm[n].ptr = kmemdup(p, size, GFP_KERNEL);

		if (priv->firm[n].ptr == NULL) {

			tuner_err("Not enough memory to load firmware file.\n");

			rc = -ENOMEM;
@@ -394,7 +394,6 @@ static int load_all_firmwares(struct dvb_frontend *fe, 
			       type, (unsigned long long)id, size);

		}



		memcpy(priv->firm[n].ptr, p, size);

		priv->firm[n].type = type;

		priv->firm[n].id   = id;

		priv->firm[n].size = size;

drivers/media/tuners/xc4000.c

+1 −2
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static int xc4000_fwupload(struct dvb_frontend *fe) 
			goto corrupt;

		}



		priv->firm[n].ptr = kzalloc(size, GFP_KERNEL);

		priv->firm[n].ptr = kmemdup(p, size, GFP_KERNEL);

		if (priv->firm[n].ptr == NULL) {

			printk(KERN_ERR "Not enough memory to load firmware file.\n");

			rc = -ENOMEM;
@@ -826,7 +826,6 @@ static int xc4000_fwupload(struct dvb_frontend *fe) 
			       type, (unsigned long long)id, size);

		}



		memcpy(priv->firm[n].ptr, p, size);

		priv->firm[n].type = type;

		priv->firm[n].id   = id;

		priv->firm[n].size = size;