summaryrefslogtreecommitdiff
path: root/drivers/staging/media/zoran/zr36050.c
diff options
context:
space:
mode:
authorCorentin Labbe <clabbe@baylibre.com>2020-09-25 20:30:17 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-10-01 09:34:14 +0200
commitb7c3b2bb9db4123b92d65d9905dacf7fbc370115 (patch)
treea8351b18b4904837efe28b10a94d8b532000aa3a /drivers/staging/media/zoran/zr36050.c
parentc638913669bbcd18282ac848b2fd2664eed62e6e (diff)
media: zoran: convert all error dprintk to pci_err/pr_err
This patch converts all errors dprintk to pci_err/pr_err. Signed-off-by: Corentin Labbe <clabbe@baylibre.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/zoran/zr36050.c')
-rw-r--r--drivers/staging/media/zoran/zr36050.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/media/zoran/zr36050.c b/drivers/staging/media/zoran/zr36050.c
index dc7928d88099..f551631c18cd 100644
--- a/drivers/staging/media/zoran/zr36050.c
+++ b/drivers/staging/media/zoran/zr36050.c
@@ -448,8 +448,7 @@ static void zr36050_init(struct zr36050 *ptr)
ptr->name, ptr->status1);
if ((ptr->status1 & 0x4) == 0) {
- dprintk(1, KERN_ERR "%s: init aborted!\n",
- ptr->name);
+ pr_err("%s: init aborted!\n", ptr->name);
return; // something is wrong, its timed out!!!!
}
@@ -518,8 +517,7 @@ static void zr36050_init(struct zr36050 *ptr)
ptr->name, ptr->status1);
if ((ptr->status1 & 0x4) == 0) {
- dprintk(1, KERN_ERR "%s: init aborted!\n",
- ptr->name);
+ pr_err("%s: init aborted!\n", ptr->name);
return; // something is wrong, its timed out!!!!
}
@@ -757,10 +755,8 @@ static int zr36050_setup(struct videocodec *codec)
}
//mem structure init
codec->data = ptr = kzalloc(sizeof(struct zr36050), GFP_KERNEL);
- if (!ptr) {
- dprintk(1, KERN_ERR "zr36050: Can't get enough memory!\n");
+ if (!ptr)
return -ENOMEM;
- }
snprintf(ptr->name, sizeof(ptr->name), "zr36050[%d]",
zr36050_codecs);