Commit 5ad5c9fc authored by Ian Cowan's avatar Ian Cowan Committed by Mauro Carvalho Chehab
Browse files

media: staging: media: zoran: replace all pr_err with zrdev_err as appropriate 



This replaces all of the pr_err calls to the preferred zrdev_err macro
that calls the dev_err macro. There are a few locations where the pr_err
is left because a zoran struct cannot be created. This is the result of
error handling for another struct's existence that is required to create
a zoran struct.

Signed-off-by: default avatarIan Cowan <ian@linux.cowan.aero>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent cc864858

drivers/staging/media/zoran/videocodec.c

+17 −8
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static struct codec_list *codeclist_top; 
struct videocodec *videocodec_attach(struct videocodec_master *master)

{

	struct codec_list *h = codeclist_top;

	struct zoran *zr;

	struct attached_list *a, *ptr;

	struct videocodec *codec;

	int res;
@@ -56,11 +57,13 @@ struct videocodec *videocodec_attach(struct videocodec_master *master) 
		return NULL;

	}



	zr = videocodec_master_to_zoran(master);



	dprintk(2, "%s: '%s', flags %lx, magic %lx\n", __func__,

		master->name, master->flags, master->magic);



	if (!h) {

		pr_err("%s: no device available\n", __func__);

		zrdev_err(zr, "%s: no device available\n", __func__);

		return NULL;

	}
@@ -105,7 +108,7 @@ struct videocodec *videocodec_attach(struct videocodec_master *master) 
		h = h->next;

	}



	pr_err("%s: no codec found!\n", __func__);

	zrdev_err(zr, "%s: no codec found!\n", __func__);

	return NULL;



 out_kfree:
@@ -116,6 +119,7 @@ struct videocodec *videocodec_attach(struct videocodec_master *master) 
int videocodec_detach(struct videocodec *codec)

{

	struct codec_list *h = codeclist_top;

	struct zoran *zr;

	struct attached_list *a, *prev;

	int res;
@@ -124,11 +128,13 @@ int videocodec_detach(struct videocodec *codec) 
		return -EINVAL;

	}



	zr = videocodec_to_zoran(codec);



	dprintk(2, "%s: '%s', type: %x, flags %lx, magic %lx\n", __func__,

		codec->name, codec->type, codec->flags, codec->magic);



	if (!h) {

		pr_err("%s: no device left...\n", __func__);

		zrdev_err(zr, "%s: no device left...\n", __func__);

		return -ENXIO;

	}
@@ -142,7 +148,7 @@ int videocodec_detach(struct videocodec *codec) 
					dprintk(3, "%s: '%s'\n", __func__, a->codec->name);

					a->codec->master_data = NULL;

				} else {

					pr_err("%s: '%s'\n", __func__, a->codec->name);

					zrdev_err(zr, "%s: '%s'\n", __func__, a->codec->name);

					a->codec->master_data = NULL;

				}

				if (!prev) {
@@ -163,7 +169,7 @@ int videocodec_detach(struct videocodec *codec) 
		h = h->next;

	}



	pr_err("%s: given codec not found!\n", __func__);

	zrdev_err(zr, "%s: given codec not found!\n", __func__);

	return -EINVAL;

}
@@ -202,25 +208,28 @@ int videocodec_register(const struct videocodec *codec) 
int videocodec_unregister(const struct videocodec *codec)

{

	struct codec_list *prev = NULL, *h = codeclist_top;

	struct zoran *zr;



	if (!codec) {

		pr_err("%s: no data!\n", __func__);

		return -EINVAL;

	}



	zr = videocodec_to_zoran((struct videocodec *)codec);



	dprintk(2,

		"videocodec: unregister '%s', type: %x, flags %lx, magic %lx\n",

		codec->name, codec->type, codec->flags, codec->magic);



	if (!h) {

		pr_err("%s: no device left...\n", __func__);

		zrdev_err(zr, "%s: no device left...\n", __func__);

		return -ENXIO;

	}



	while (h) {

		if (codec == h->codec) {

			if (h->attached) {

				pr_err("videocodec: '%s' is used\n", h->codec->name);

				zrdev_err(zr, "videocodec: '%s' is used\n", h->codec->name);

				return -EBUSY;

			}

			dprintk(3, "videocodec: unregister '%s' is ok.\n",
@@ -241,7 +250,7 @@ int videocodec_unregister(const struct videocodec *codec) 
		h = h->next;

	}



	pr_err("%s: given codec not found!\n", __func__);

	zrdev_err(zr, "%s: given codec not found!\n", __func__);

	return -EINVAL;

}

drivers/staging/media/zoran/zr36016.c

+18 −9
Original line number Diff line number Diff line
@@ -43,12 +43,13 @@ MODULE_PARM_DESC(zr36016_debug, "Debug level (0-4)"); 
static u8 zr36016_read(struct zr36016 *ptr, u16 reg)

{

	u8 value = 0;

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	/* just in case something is wrong... */

	if (ptr->codec->master_data->readreg)

		value = (ptr->codec->master_data->readreg(ptr->codec, reg)) & 0xFF;

	else

		pr_err("%s: invalid I/O setup, nothing read!\n", ptr->name);

		zrdev_err(zr, "%s: invalid I/O setup, nothing read!\n", ptr->name);



	dprintk(4, "%s: reading from 0x%04x: %02x\n", ptr->name, reg, value);
@@ -57,13 +58,15 @@ static u8 zr36016_read(struct zr36016 *ptr, u16 reg) 


static void zr36016_write(struct zr36016 *ptr, u16 reg, u8 value)

{

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	dprintk(4, "%s: writing 0x%02x to 0x%04x\n", ptr->name, value, reg);



	// just in case something is wrong...

	if (ptr->codec->master_data->writereg)

		ptr->codec->master_data->writereg(ptr->codec, reg, value);

	else

		pr_err("%s: invalid I/O setup, nothing written!\n", ptr->name);

		zrdev_err(zr, "%s: invalid I/O setup, nothing written!\n", ptr->name);

}



/* indirect read and write functions */
@@ -72,13 +75,14 @@ static void zr36016_write(struct zr36016 *ptr, u16 reg, u8 value) 
static u8 zr36016_readi(struct zr36016 *ptr, u16 reg)

{

	u8 value = 0;

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	/* just in case something is wrong... */

	if ((ptr->codec->master_data->writereg) && (ptr->codec->master_data->readreg)) {

		ptr->codec->master_data->writereg(ptr->codec, ZR016_IADDR, reg & 0x0F);	// ADDR

		value = (ptr->codec->master_data->readreg(ptr->codec, ZR016_IDATA)) & 0xFF;	// DATA

	} else {

		pr_err("%s: invalid I/O setup, nothing read (i)!\n", ptr->name);

		zrdev_err(zr, "%s: invalid I/O setup, nothing read (i)!\n", ptr->name);

	}



	dprintk(4, "%s: reading indirect from 0x%04x: %02x\n", ptr->name, reg, value);
@@ -87,6 +91,8 @@ static u8 zr36016_readi(struct zr36016 *ptr, u16 reg) 


static void zr36016_writei(struct zr36016 *ptr, u16 reg, u8 value)

{

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	dprintk(4, "%s: writing indirect 0x%02x to 0x%04x\n", ptr->name,

		value, reg);
@@ -95,7 +101,7 @@ static void zr36016_writei(struct zr36016 *ptr, u16 reg, u8 value) 
		ptr->codec->master_data->writereg(ptr->codec, ZR016_IADDR, reg & 0x0F);	// ADDR

		ptr->codec->master_data->writereg(ptr->codec, ZR016_IDATA, value & 0x0FF);	// DATA

	} else {

		pr_err("%s: invalid I/O setup, nothing written (i)!\n", ptr->name);

		zrdev_err(zr, "%s: invalid I/O setup, nothing written (i)!\n", ptr->name);

	}

}
@@ -120,6 +126,8 @@ static u8 zr36016_read_version(struct zr36016 *ptr) 


static int zr36016_basic_test(struct zr36016 *ptr)

{

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	if (zr36016_debug) {

		int i;
@@ -133,18 +141,18 @@ static int zr36016_basic_test(struct zr36016 *ptr) 
	// it back in both cases

	zr36016_writei(ptr, ZR016I_PAX_LO, 0x00);

	if (zr36016_readi(ptr, ZR016I_PAX_LO) != 0x0) {

		pr_err("%s: attach failed, can't connect to vfe processor!\n", ptr->name);

		zrdev_err(zr, "%s: attach failed, can't connect to vfe processor!\n", ptr->name);

		return -ENXIO;

	}

	zr36016_writei(ptr, ZR016I_PAX_LO, 0x0d0);

	if (zr36016_readi(ptr, ZR016I_PAX_LO) != 0x0d0) {

		pr_err("%s: attach failed, can't connect to vfe processor!\n", ptr->name);

		zrdev_err(zr, "%s: attach failed, can't connect to vfe processor!\n", ptr->name);

		return -ENXIO;

	}

	// we allow version numbers from 0-3, should be enough, though

	zr36016_read_version(ptr);

	if (ptr->version & 0x0c) {

		pr_err("%s: attach failed, suspicious version %d found...\n", ptr->name,

		zrdev_err(zr, "%s: attach failed, suspicious version %d found...\n", ptr->name,

			  ptr->version);

		return -ENXIO;

	}
@@ -352,12 +360,13 @@ static int zr36016_unset(struct videocodec *codec) 
static int zr36016_setup(struct videocodec *codec)

{

	struct zr36016 *ptr;

	struct zoran *zr = videocodec_to_zoran(codec);

	int res;



	dprintk(2, "zr36016: initializing VFE subsystem #%d.\n", zr36016_codecs);



	if (zr36016_codecs == MAX_CODECS) {

		pr_err("zr36016: Can't attach more codecs!\n");

		zrdev_err(zr, "zr36016: Can't attach more codecs!\n");

		return -ENOSPC;

	}

	//mem structure init

drivers/staging/media/zoran/zr36050.c

+3 −2
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ static void zr36050_init(struct zr36050 *ptr) 
{

	int sum = 0;

	long bitcnt, tmp;

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	if (ptr->mode == CODEC_DO_COMPRESSION) {

		dprintk(2, "%s: COMPRESSION SETUP\n", ptr->name);
@@ -446,7 +447,7 @@ static void zr36050_init(struct zr36050 *ptr) 
			ptr->name, ptr->status1);



		if ((ptr->status1 & 0x4) == 0) {

			pr_err("%s: init aborted!\n", ptr->name);

			zrdev_err(zr, "%s: init aborted!\n", ptr->name);

			return;	// something is wrong, its timed out!!!!

		}
@@ -515,7 +516,7 @@ static void zr36050_init(struct zr36050 *ptr) 
			ptr->name, ptr->status1);



		if ((ptr->status1 & 0x4) == 0) {

			pr_err("%s: init aborted!\n", ptr->name);

			zrdev_err(zr, "%s: init aborted!\n", ptr->name);

			return;	// something is wrong, its timed out!!!!

		}

drivers/staging/media/zoran/zr36060.c

+13 −6
Original line number Diff line number Diff line
@@ -51,25 +51,28 @@ MODULE_PARM_DESC(zr36060_debug, "Debug level (0-4)"); 
static u8 zr36060_read(struct zr36060 *ptr, u16 reg)

{

	u8 value = 0;

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	// just in case something is wrong...

	if (ptr->codec->master_data->readreg)

		value = (ptr->codec->master_data->readreg(ptr->codec, reg)) & 0xff;

	else

		pr_err("%s: invalid I/O setup, nothing read!\n", ptr->name);

		zrdev_err(zr, "%s: invalid I/O setup, nothing read!\n", ptr->name);



	return value;

}



static void zr36060_write(struct zr36060 *ptr, u16 reg, u8 value)

{

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	dprintk(4, "0x%02x @0x%04x\n", value, reg);



	// just in case something is wrong...

	if (ptr->codec->master_data->writereg)

		ptr->codec->master_data->writereg(ptr->codec, reg, value);

	else

		pr_err("%s: invalid I/O setup, nothing written!\n", ptr->name);

		zrdev_err(zr, "%s: invalid I/O setup, nothing written!\n", ptr->name);

}



/* =========================================================================
@@ -117,15 +120,17 @@ static void zr36060_wait_end(struct zr36060 *ptr) 
/* Basic test of "connectivity", writes/reads to/from memory the SOF marker */

static int zr36060_basic_test(struct zr36060 *ptr)

{

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	if ((zr36060_read(ptr, ZR060_IDR_DEV) != 0x33) &&

	    (zr36060_read(ptr, ZR060_IDR_REV) != 0x01)) {

		pr_err("%s: attach failed, can't connect to jpeg processor!\n", ptr->name);

		zrdev_err(zr, "%s: attach failed, can't connect to jpeg processor!\n", ptr->name);

		return -ENXIO;

	}



	zr36060_wait_end(ptr);

	if (ptr->status & ZR060_CFSR_BUSY) {

		pr_err("%s: attach failed, jpeg processor failed (end flag)!\n", ptr->name);

		zrdev_err(zr, "%s: attach failed, jpeg processor failed (end flag)!\n", ptr->name);

		return -EBUSY;

	}
@@ -321,6 +326,7 @@ static void zr36060_init(struct zr36060 *ptr) 
{

	int sum = 0;

	long bitcnt, tmp;

	struct zoran *zr = videocodec_to_zoran(ptr->codec);



	if (ptr->mode == CODEC_DO_COMPRESSION) {

		dprintk(2, "%s: COMPRESSION SETUP\n", ptr->name);
@@ -444,7 +450,7 @@ static void zr36060_init(struct zr36060 *ptr) 
	dprintk(2, "%s: Status after table preload: 0x%02x\n", ptr->name, ptr->status);



	if (ptr->status & ZR060_CFSR_BUSY) {

		pr_err("%s: init aborted!\n", ptr->name);

		zrdev_err(zr, "%s: init aborted!\n", ptr->name);

		return;		// something is wrong, its timed out!!!!

	}

}
@@ -778,12 +784,13 @@ static int zr36060_unset(struct videocodec *codec) 
static int zr36060_setup(struct videocodec *codec)

{

	struct zr36060 *ptr;

	struct zoran *zr = videocodec_to_zoran(codec);

	int res;



	dprintk(2, "zr36060: initializing MJPEG subsystem #%d.\n", zr36060_codecs);



	if (zr36060_codecs == MAX_CODECS) {

		pr_err("zr36060: Can't attach more codecs!\n");

		zrdev_err(zr, "zr36060: Can't attach more codecs!\n");

		return -ENOSPC;

	}

	//mem structure init