media: cedrus: don't initialize pointers with zero

A common mistake is to assume that initializing a var with:
	struct foo f = { 0 };

Would initialize a zeroed struct. Actually, what this does is
to initialize the first element of the struct to zero.

According to C99 Standard 6.7.8.21:

    "If there are fewer initializers in a brace-enclosed
     list than there are elements or members of an aggregate,
     or fewer characters in a string literal used to initialize
     an array of known size than there are elements in the array,
     the remainder of the aggregate shall be initialized implicitly
     the same as objects that have static storage duration."

So, in practice, it could zero the entire struct, but, if the
first element is not an integer, it will produce warnings:

	drivers/staging/media/sunxi/cedrus/cedrus.c:drivers/staging/media/sunxi/cedrus/cedrus.c:78:49:  warning: Using plain integer as NULL pointer
	drivers/staging/media/sunxi/cedrus/cedrus_dec.c:drivers/staging/media/sunxi/cedrus/cedrus_dec.c:29:35:  warning: Using plain integer as NULL pointer

As the right initialization would be, instead:

	struct foo f = { NULL };

Another way to initialize it with gcc is to use:

	struct foo f = {};

That seems to be a gcc extension, but clang also does the right thing,
and that's a clean way for doing it.

Anyway, I decided to check upstream what's the most commonly pattern.
The "= {}" pattern has about 2000 entries:

	$ git grep -E "=\s*\{\s*\}"|wc -l
	1951

The standard-C compliant pattern has about 2500 entries:

	$ git grep -E "=\s*\{\s*NULL\s*\}"|wc -l
	137
	$ git grep -E "=\s*\{\s*0\s*\}"|wc -l
	2323

Meaning that developers have split options on that.

So, let's opt to the simpler form.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2018-12-07 08:03:16 -05:00
parent 9ed5d5fb8b
commit e4d7b113fd
2 changed files with 2 additions and 2 deletions

View File

@ -76,7 +76,7 @@ static int cedrus_init_ctrls(struct cedrus_dev *dev, struct cedrus_ctx *ctx)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < CEDRUS_CONTROLS_COUNT; i++) { for (i = 0; i < CEDRUS_CONTROLS_COUNT; i++) {
struct v4l2_ctrl_config cfg = { 0 }; struct v4l2_ctrl_config cfg = {};
cfg.elem_size = cedrus_controls[i].elem_size; cfg.elem_size = cedrus_controls[i].elem_size;
cfg.id = cedrus_controls[i].id; cfg.id = cedrus_controls[i].id;

View File

@ -26,7 +26,7 @@ void cedrus_device_run(void *priv)
{ {
struct cedrus_ctx *ctx = priv; struct cedrus_ctx *ctx = priv;
struct cedrus_dev *dev = ctx->dev; struct cedrus_dev *dev = ctx->dev;
struct cedrus_run run = { 0 }; struct cedrus_run run = {};
struct media_request *src_req; struct media_request *src_req;
run.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); run.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);