Skip to content

Commit

Permalink
[media] s5p-tv: Add missing braces around sizeof in mixer_video.c
Browse files Browse the repository at this point in the history
Silences several checkpatch warnings of the type:
WARNING: sizeof *out should be sizeof(*out)
FILE: media/platform/s5p-tv/mixer_video.c:98:
		out = kzalloc(sizeof *out, GFP_KERNEL);

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Sachin Kamat authored and Mauro Carvalho Chehab committed Jan 6, 2013
1 parent 80f0dee commit c0d5120
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/media/platform/s5p-tv/mixer_video.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ int __devinit mxr_acquire_video(struct mxr_device *mdev,
/* trying to register next output */
if (sd == NULL)
continue;
out = kzalloc(sizeof *out, GFP_KERNEL);
out = kzalloc(sizeof(*out), GFP_KERNEL);
if (out == NULL) {
mxr_err(mdev, "no memory for '%s'\n",
conf->output_name);
Expand Down Expand Up @@ -127,7 +127,7 @@ int __devinit mxr_acquire_video(struct mxr_device *mdev,
/* kfree is NULL-safe */
for (i = 0; i < mdev->output_cnt; ++i)
kfree(mdev->output[i]);
memset(mdev->output, 0, sizeof mdev->output);
memset(mdev->output, 0, sizeof(mdev->output));

fail_vb2_allocator:
/* freeing allocator context */
Expand Down Expand Up @@ -160,8 +160,8 @@ static int mxr_querycap(struct file *file, void *priv,

mxr_dbg(layer->mdev, "%s:%d\n", __func__, __LINE__);

strlcpy(cap->driver, MXR_DRIVER_NAME, sizeof cap->driver);
strlcpy(cap->card, layer->vfd.name, sizeof cap->card);
strlcpy(cap->driver, MXR_DRIVER_NAME, sizeof(cap->driver));
strlcpy(cap->card, layer->vfd.name, sizeof(cap->card));
sprintf(cap->bus_info, "%d", layer->idx);
cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT_MPLANE;
cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
Expand Down Expand Up @@ -192,7 +192,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
struct mxr_device *mdev = layer->mdev;
struct v4l2_mbus_framefmt mbus_fmt;

memset(&layer->geo, 0, sizeof layer->geo);
memset(&layer->geo, 0, sizeof(layer->geo));

mxr_get_mbus_fmt(mdev, &mbus_fmt);

Expand Down Expand Up @@ -425,7 +425,7 @@ static int mxr_s_selection(struct file *file, void *fh,
struct mxr_geometry tmp;
struct v4l2_rect res;

memset(&res, 0, sizeof res);
memset(&res, 0, sizeof(res));

mxr_dbg(layer->mdev, "%s: rect: %dx%d@%d,%d\n", __func__,
s->r.width, s->r.height, s->r.left, s->r.top);
Expand Down Expand Up @@ -464,7 +464,7 @@ static int mxr_s_selection(struct file *file, void *fh,
/* apply change and update geometry if needed */
if (target) {
/* backup current geometry if setup fails */
memcpy(&tmp, geo, sizeof tmp);
memcpy(&tmp, geo, sizeof(tmp));

/* apply requested selection */
target->x_offset = s->r.left;
Expand Down Expand Up @@ -496,7 +496,7 @@ static int mxr_s_selection(struct file *file, void *fh,
fail:
/* restore old geometry, which is not touched if target is NULL */
if (target)
memcpy(geo, &tmp, sizeof tmp);
memcpy(geo, &tmp, sizeof(tmp));
return -ERANGE;
}

Expand Down Expand Up @@ -1071,7 +1071,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
{
struct mxr_layer *layer;

layer = kzalloc(sizeof *layer, GFP_KERNEL);
layer = kzalloc(sizeof(*layer), GFP_KERNEL);
if (layer == NULL) {
mxr_err(mdev, "not enough memory for layer.\n");
goto fail;
Expand Down

0 comments on commit c0d5120

Please sign in to comment.