Merge tag 'media/v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / drivers / staging / media / davinci_vpfe / dm365_ipipe.c

diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
index 95942768639cdeb7108cb569f238f9b10b2bf324..dcfeac8184512f1934e3cb2e2c3594da1e9bab66 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
@@ -695,21 +695,21 @@ static int ipipe_get_gamma_params(struct vpfe_ipipe_device *ipipe, void *param)
 
        if (!gamma->bypass_r) {
                dev_err(dev,
-                       "ipipe_get_gamma_params: table ptr empty for R\n");
+                       "%s: table ptr empty for R\n", __func__);
                return -EINVAL;
        }
        memcpy(gamma_param->table_r, gamma->table_r,
               (table_size * sizeof(struct vpfe_ipipe_gamma_entry)));
 
        if (!gamma->bypass_g) {
-               dev_err(dev, "ipipe_get_gamma_params: table ptr empty for G\n");
+               dev_err(dev, "%s: table ptr empty for G\n", __func__);
                return -EINVAL;
        }
        memcpy(gamma_param->table_g, gamma->table_g,
               (table_size * sizeof(struct vpfe_ipipe_gamma_entry)));
 
        if (!gamma->bypass_b) {
-               dev_err(dev, "ipipe_get_gamma_params: table ptr empty for B\n");
+               dev_err(dev, "%s: table ptr empty for B\n", __func__);
                return -EINVAL;
        }
        memcpy(gamma_param->table_b, gamma->table_b,
@@ -1801,7 +1801,7 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev)
 
        v4l2_subdev_init(sd, &ipipe_v4l2_ops);
        sd->internal_ops = &ipipe_v4l2_internal_ops;
-       strlcpy(sd->name, "DAVINCI IPIPE", sizeof(sd->name));
+       strscpy(sd->name, "DAVINCI IPIPE", sizeof(sd->name));
        sd->grp_id = 1 << 16;   /* group ID for davinci subdevs */
        v4l2_set_subdevdata(sd, ipipe);
        sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;