staging: media: lirc: replace dev_err by pr_err

PATCH In review Aya Mahfouz 3 participants 5 messages Nov 4, 2014 – Nov 5, 2014 1 message not in the archive

Subsystems (2)

Media (V4L/DVB) Staging

lore

Share & tools

lore

Aya Mahfouz

author

2014-11-04 00:13 UTC #0 lore raw

PATCH 1/1 staging: media: lirc: replace dev_err by pr_err

This patch replaces dev_err by pr_err since the value of ir is NULL when the message is displayed.

Signed-off-by Aya Mahfouz <[email protected]>

---
 drivers/staging/media/lirc/lirc_zilog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/media/lirc/lirc_zilog.c +1 -1

index 11a7cb1..ecdd71e 100644
@@ -1633,7 +1633,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);

Signature · 1 line

1.9.3

Sudip Mukherjee

2014-11-04 09:37 UTC #1 lore raw

Quoted 13 lines · Aya Mahfouz

This patch replaces dev_err by pr_err since the value of ir is NULL when the message is displayed.
Signed-off-by Aya Mahfouz <[email protected]>
---
 drivers/staging/media/lirc/lirc_zilog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/lirc/lirc_zilog.c +0 -0
index 11a7cb1..ecdd71e 100644

drivers/staging/media/lirc/lirc_zilog.c out_put_xx: · line 1636

Quoted 5 lines

drivers/staging/media/lirc/lirc_zilog.c +1 -1

@@ -1633,7 +1633,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",

hi,
instead of ir->l.dev , can you please try dev_err like this :

dev_err(&client->dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",

	__func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
	ret);

thanks
sudip

Quoted 11 lines

drivers/staging/media/lirc/lirc_zilog.c +0 -0

 		    __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
 		   ret);
 	mutex_unlock(&ir_devices_lock);

Signature · 7 lines

1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

A message that is not in the archive (sent off-list or not yet received): [email protected]

Sudip Mukherjee

2014-11-05 07:27 UTC #3 lore raw

Quoted 23 lines · Aya Mahfouz

Quoted 22 lines · Sudip Mukherjee
Quoted 13 lines · Aya Mahfouz
This patch replaces dev_err by pr_err since the value of ir is NULL when the message is displayed.
Signed-off-by Aya Mahfouz <[email protected]>
---
 drivers/staging/media/lirc/lirc_zilog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/lirc/lirc_zilog.c +0 -0
index 11a7cb1..ecdd71e 100644
drivers/staging/media/lirc/lirc_zilog.c out_put_xx: · line 1636
Quoted 5 lines
drivers/staging/media/lirc/lirc_zilog.c +1 -1
@@ -1633,7 +1633,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",
hi,
instead of ir->l.dev , can you please try dev_err like this :

Quoted 8 lines

Quoted 4 lines
dev_err(&client->dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
	__func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
	ret);		    
Thanks Sudip. It works. Please add the Reviewed-by tag to the newer patch.

i think you forgot to add cc to the list and Greg K-H in your reply.
Greg should know that this patch is now not required, otherwise he might apply it to his tree. so just replying to your mail while adding everyone else in the cc.

thanks
sudip

Quoted 18 lines

Quoted 3 lines

thanks
sudip

Kind Regards,
Aya Saif El-yazal Mahfouz

Quoted 12 lines

drivers/staging/media/lirc/lirc_zilog.c +0 -0

 		    __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
 		   ret);
 	mutex_unlock(&ir_devices_lock);

Signature · 7 lines

1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Aya Mahfouz

author

2014-11-05 08:45 UTC #4 lore raw

Quoted 32 lines · Sudip Mukherjee

Quoted 23 lines · Aya Mahfouz
Quoted 22 lines · Sudip Mukherjee
Quoted 13 lines · Aya Mahfouz
This patch replaces dev_err by pr_err since the value of ir is NULL when the message is displayed.
Signed-off-by Aya Mahfouz <[email protected]>
---
 drivers/staging/media/lirc/lirc_zilog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/lirc/lirc_zilog.c +0 -0
index 11a7cb1..ecdd71e 100644
drivers/staging/media/lirc/lirc_zilog.c out_put_xx: · line 1636
Quoted 5 lines
drivers/staging/media/lirc/lirc_zilog.c +1 -1
@@ -1633,7 +1633,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",
hi,
instead of ir->l.dev , can you please try dev_err like this :
Quoted 8 lines
Quoted 4 lines
dev_err(&client->dev, "%s: probing IR %s on %s (i2c-%d) failed with %d\n",
	__func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
	ret);		    
Thanks Sudip. It works. Please add the Reviewed-by tag to the newer patch.

Quoted 8 lines

i think you forgot to add cc to the list and Greg K-H in your reply.
Greg should know that this patch is now not required, otherwise he might apply it to his tree. so just replying to your mail while adding everyone else in the cc.
thanks
sudip

Apologies Sudip and thanks again!

Kind Regards,
Aya Saif El-yazal Mahfouz

Quoted 18 lines

Quoted 3 lines

thanks
sudip

Kind Regards,
Aya Saif El-yazal Mahfouz

Quoted 12 lines

drivers/staging/media/lirc/lirc_zilog.c +0 -0

 		    __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
 		   ret);
 	mutex_unlock(&ir_devices_lock);

Signature · 7 lines

1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Mauro Carvalho Chehab

2014-11-05 10:14 UTC #5 lore raw

In reply to Aya Mahfouz

Em Tue, 4 Nov 2014 02:13:19 +0200
Aya Mahfouz <[email protected]> escreveu:

Quoted 2 lines

This patch replaces dev_err by pr_err since the value of ir is NULL when the message is displayed.

This one doesn't apply at the media tree:

drivers/staging/media/lirc/lirc_zilog.c +4 -0

index 1ccf6262ab36..babd6470f246 100644
@@ -1636,7 +1636,11 @@ out_put_xx:
 out_put_ir:
 	put_ir_device(ir, true);
 out_no_ir:
+<<<<<<<
 	zilog_error("%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);

Perhaps it depends on some patch merged via Greg's tree?

Regards,
Mauro

Quoted 19 lines

Signed-off-by Aya Mahfouz <[email protected]>

---
 drivers/staging/media/lirc/lirc_zilog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/media/lirc/lirc_zilog.c +1 -1

index 11a7cb1..ecdd71e 100644
@@ -1633,7 +1633,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);