Re: [PATCH] staging: media: lirc: replace dev_err by pr_err

[Mauro Carvalho Chehab <mchehab@osg.samsung.com>]

Em Tue, 4 Nov 2014 02:13:19 +0200
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> escreveu:

> 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:

diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index 1ccf6262ab36..babd6470f246 100644
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -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
> 
> Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
> ---
>  drivers/staging/media/lirc/lirc_zilog.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
> index 11a7cb1..ecdd71e 100644
> --- a/drivers/staging/media/lirc/lirc_zilog.c
> +++ b/drivers/staging/media/lirc/lirc_zilog.c
> @@ -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);