From: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
To: Jarod Wilson <jarod@wilsonet.com>,
Mauro Carvalho Chehab <m.chehab@samsung.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>,
Dan Carpenter <dan.carpenter@oracle.com>,
Gulsah Kose <gulsah.1004@gmail.com>,
Matina Maria Trompouki <mtrompou@gmail.com>
Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] staging: media: lirc: lirc_zilog.c: adjust debug messages
Date: Sat, 1 Nov 2014 23:36:54 +0200 [thread overview]
Message-ID: <20141101213654.GA3191@localhost.localdomain> (raw)
This patch removes one debug message and replaces a dev_err
call by pr_err.
Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
---
drivers/staging/media/lirc/lirc_zilog.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index 11a7cb1..ba538cd4 100644
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -1336,11 +1336,6 @@ static int close(struct inode *node, struct file *filep)
/* find our IR struct */
struct IR *ir = filep->private_data;
- if (ir == NULL) {
- dev_err(ir->l.dev, "close: no private_data attached to the file!\n");
- return -ENODEV;
- }
-
atomic_dec(&ir->open_count);
put_ir_device(ir, false);
@@ -1633,7 +1628,7 @@ out_put_xx:
out_put_ir:
put_ir_device(ir, true);
out_no_ir:
- dev_err(ir->l.dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
+ pr_err("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
__func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
ret);
mutex_unlock(&ir_devices_lock);
--
1.9.3
next reply other threads:[~2014-11-01 21:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-01 21:36 Aya Mahfouz [this message]
2014-11-02 11:40 ` [PATCH] staging: media: lirc: lirc_zilog.c: adjust debug messages Konrad Zapalowicz
2014-11-04 0:17 ` Aya Mahfouz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141101213654.GA3191@localhost.localdomain \
--to=mahfouz.saif.elyazal@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=gulsah.1004@gmail.com \
--cc=jarod@wilsonet.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=mtrompou@gmail.com \
--cc=tuomas.tynkkynen@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.