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

Commit 927933f7 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: move coda_product_name above vidioc_querycap 



Use the product name (currently CodaDx6 or CODA7541)
to fill the v4l2_capabilities.name field.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 0fd84dc8

drivers/media/platform/coda.c

+19 −16
Original line number Diff line number Diff line
@@ -394,14 +394,32 @@ static struct coda_codec *coda_find_codec(struct coda_dev *dev, int src_fourcc, 
	return &codecs[k];

}



static char *coda_product_name(int product)

{

	static char buf[9];



	switch (product) {

	case CODA_DX6:

		return "CodaDx6";

	case CODA_7541:

		return "CODA7541";

	default:

		snprintf(buf, sizeof(buf), "(0x%04x)", product);

		return buf;

	}

}



/*

 * V4L2 ioctl() operations.

 */

static int vidioc_querycap(struct file *file, void *priv,

			   struct v4l2_capability *cap)

{

	struct coda_ctx *ctx = fh_to_ctx(priv);



	strlcpy(cap->driver, CODA_NAME, sizeof(cap->driver));

	strlcpy(cap->card, CODA_NAME, sizeof(cap->card));

	strlcpy(cap->card, coda_product_name(ctx->dev->devtype->product),

		sizeof(cap->card));

	strlcpy(cap->bus_info, "platform:" CODA_NAME, sizeof(cap->bus_info));

	/*

	 * This is only a mem-to-mem video device. The capture and output
@@ -2868,21 +2886,6 @@ static bool coda_firmware_supported(u32 vernum) 
	return false;

}



static char *coda_product_name(int product)

{

	static char buf[9];



	switch (product) {

	case CODA_DX6:

		return "CodaDx6";

	case CODA_7541:

		return "CODA7541";

	default:

		snprintf(buf, sizeof(buf), "(0x%04x)", product);

		return buf;

	}

}



static int coda_hw_init(struct coda_dev *dev)

{

	u16 product, major, minor, release;