public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: media: lirc: lirc_zilog.c: adjust debug messages
@ 2014-11-01 21:36 Aya Mahfouz
  2014-11-02 11:40 ` Konrad Zapalowicz
  0 siblings, 1 reply; 3+ messages in thread
From: Aya Mahfouz @ 2014-11-01 21:36 UTC (permalink / raw)
  To: Jarod Wilson, Mauro Carvalho Chehab, Greg Kroah-Hartman,
	Tuomas Tynkkynen, Dan Carpenter, Gulsah Kose,
	Matina Maria Trompouki
  Cc: linux-media, devel, linux-kernel

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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-11-04  0:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-01 21:36 [PATCH] staging: media: lirc: lirc_zilog.c: adjust debug messages Aya Mahfouz
2014-11-02 11:40 ` Konrad Zapalowicz
2014-11-04  0:17   ` Aya Mahfouz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox