[PATCH 1/2] can: mcp251x: Move diagnostic messages to dev_dbg()

[PATCH 1/2] can: mcp251x: Move diagnostic messages to dev_dbg()

[Alexander Shiyan]

This patch moves diagnostic messages used for debugging purposes
to dev_dbg().

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/net/can/mcp251x.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index cdb9808..56e38a6 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -601,10 +601,10 @@ static int mcp251x_do_set_bittiming(struct net_device *net)
 			  (bt->prop_seg - 1));
 	mcp251x_write_bits(spi, CNF3, CNF3_PHSEG2_MASK,
 			   (bt->phase_seg2 - 1));
-	dev_info(&spi->dev, "CNF: 0x%02x 0x%02x 0x%02x\n",
-		 mcp251x_read_reg(spi, CNF1),
-		 mcp251x_read_reg(spi, CNF2),
-		 mcp251x_read_reg(spi, CNF3));
+	dev_dbg(&spi->dev, "CNF: 0x%02x 0x%02x 0x%02x\n",
+		mcp251x_read_reg(spi, CNF1),
+		mcp251x_read_reg(spi, CNF2),
+		mcp251x_read_reg(spi, CNF3));
 
 	return 0;
 }
@@ -1155,7 +1155,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
 
 	devm_can_led_init(net);
 
-	dev_info(&spi->dev, "probed\n");
+	dev_dbg(&spi->dev, "probed\n");
 
 	return ret;
 
-- 
1.8.3.2

[PATCH 2/2] can: mcp251x: Remove #ifdef CONFIG_PM_SLEEP

[Alexander Shiyan]

This patch removes #ifdef CONFIG_PM_SLEEP to improve compile
coverage.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/net/can/mcp251x.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 56e38a6..2ac02c7 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -1197,9 +1197,7 @@ static int mcp251x_can_remove(struct spi_device *spi)
 	return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-
-static int mcp251x_can_suspend(struct device *dev)
+static int __maybe_unused mcp251x_can_suspend(struct device *dev)
 {
 	struct spi_device *spi = to_spi_device(dev);
 	struct mcp251x_priv *priv = spi_get_drvdata(spi);
@@ -1229,7 +1227,7 @@ static int mcp251x_can_suspend(struct device *dev)
 	return 0;
 }
 
-static int mcp251x_can_resume(struct device *dev)
+static int __maybe_unused mcp251x_can_resume(struct device *dev)
 {
 	struct spi_device *spi = to_spi_device(dev);
 	struct mcp251x_priv *priv = spi_get_drvdata(spi);
@@ -1249,7 +1247,6 @@ static int mcp251x_can_resume(struct device *dev)
 	enable_irq(spi->irq);
 	return 0;
 }
-#endif
 
 static SIMPLE_DEV_PM_OPS(mcp251x_can_pm_ops, mcp251x_can_suspend,
 	mcp251x_can_resume);
-- 
1.8.3.2

Re: [PATCH 2/2] can: mcp251x: Remove #ifdef CONFIG_PM_SLEEP

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

On 02/22/2014 06:51 AM, Alexander Shiyan wrote:
> This patch removes #ifdef CONFIG_PM_SLEEP to improve compile
> coverage.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

Applied to can-next.

Tnx,
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]

Re: [PATCH 1/2] can: mcp251x: Move diagnostic messages to dev_dbg()

[Wolfgang Grandegger]

On 02/22/2014 06:51 AM, Alexander Shiyan wrote:
> This patch moves diagnostic messages used for debugging purposes
> to dev_dbg().
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  drivers/net/can/mcp251x.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
> index cdb9808..56e38a6 100644
> --- a/drivers/net/can/mcp251x.c
> +++ b/drivers/net/can/mcp251x.c
> @@ -601,10 +601,10 @@ static int mcp251x_do_set_bittiming(struct net_device *net)
>  			  (bt->prop_seg - 1));
>  	mcp251x_write_bits(spi, CNF3, CNF3_PHSEG2_MASK,
>  			   (bt->phase_seg2 - 1));
> -	dev_info(&spi->dev, "CNF: 0x%02x 0x%02x 0x%02x\n",
> -		 mcp251x_read_reg(spi, CNF1),
> -		 mcp251x_read_reg(spi, CNF2),
> -		 mcp251x_read_reg(spi, CNF3));
> +	dev_dbg(&spi->dev, "CNF: 0x%02x 0x%02x 0x%02x\n",
> +		mcp251x_read_reg(spi, CNF1),
> +		mcp251x_read_reg(spi, CNF2),
> +		mcp251x_read_reg(spi, CNF3));
>  
>  	return 0;
>  }

It's common practice to show the bit-timing settings in the kernel log.
Therefore I prefer to keep this useful dev_info. If we change it, we
should update all other drivers as well.

> @@ -1155,7 +1155,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
>  

>  	devm_can_led_init(net);
>  
> -	dev_info(&spi->dev, "probed\n");
> +	dev_dbg(&spi->dev, "probed\n");

This one could even be removed.

Wolfgang.

Re: [PATCH 1/2] can: mcp251x: Move diagnostic messages to dev_dbg()

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1968 bytes --]

On 02/23/2014 08:13 PM, Wolfgang Grandegger wrote:
> On 02/22/2014 06:51 AM, Alexander Shiyan wrote:
>> This patch moves diagnostic messages used for debugging purposes
>> to dev_dbg().
>>
>> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
>> ---
>>  drivers/net/can/mcp251x.c | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
>> index cdb9808..56e38a6 100644
>> --- a/drivers/net/can/mcp251x.c
>> +++ b/drivers/net/can/mcp251x.c
>> @@ -601,10 +601,10 @@ static int mcp251x_do_set_bittiming(struct net_device *net)
>>  			  (bt->prop_seg - 1));
>>  	mcp251x_write_bits(spi, CNF3, CNF3_PHSEG2_MASK,
>>  			   (bt->phase_seg2 - 1));
>> -	dev_info(&spi->dev, "CNF: 0x%02x 0x%02x 0x%02x\n",
>> -		 mcp251x_read_reg(spi, CNF1),
>> -		 mcp251x_read_reg(spi, CNF2),
>> -		 mcp251x_read_reg(spi, CNF3));
>> +	dev_dbg(&spi->dev, "CNF: 0x%02x 0x%02x 0x%02x\n",
>> +		mcp251x_read_reg(spi, CNF1),
>> +		mcp251x_read_reg(spi, CNF2),
>> +		mcp251x_read_reg(spi, CNF3));
>>  
>>  	return 0;
>>  }
> 
> It's common practice to show the bit-timing settings in the kernel log.
> Therefore I prefer to keep this useful dev_info. If we change it, we
> should update all other drivers as well.

I'm not sure if the output is needed. The bit timing algorithm seems to
work so I think it's okay to make the driver more quiet.

>> @@ -1155,7 +1155,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
>>  
> 
>>  	devm_can_led_init(net);
>>  
>> -	dev_info(&spi->dev, "probed\n");
>> +	dev_dbg(&spi->dev, "probed\n");
> 
> This one could even be removed.

+1

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]

Re: [PATCH 1/2] can: mcp251x: Move diagnostic messages to dev_dbg()

[Alexander Shiyan]

Вторник, 25 февраля 2014, 21:41 +01:00 от Marc Kleine-Budde <mkl@pengutronix.de>:
> On 02/23/2014 08:13 PM, Wolfgang Grandegger wrote:
> > On 02/22/2014 06:51 AM, Alexander Shiyan wrote:
> >> This patch moves diagnostic messages used for debugging purposes
> >> to dev_dbg().
...
> >> @@ -1155,7 +1155,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
> >>  
> > 
> >>  	devm_can_led_init(net);
> >>  
> >> -	dev_info(&spi->dev, "probed\n");
> >> +	dev_dbg(&spi->dev, "probed\n");
> > 
> > This one could even be removed.
> 
> +1

Resend this one modified patch?

---

Re: [PATCH 1/2] can: mcp251x: Move diagnostic messages to dev_dbg()

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

On 02/26/2014 05:20 AM, Alexander Shiyan wrote:
> Вторник, 25 февраля 2014, 21:41 +01:00 от Marc Kleine-Budde <mkl@pengutronix.de>:
>> On 02/23/2014 08:13 PM, Wolfgang Grandegger wrote:
>>> On 02/22/2014 06:51 AM, Alexander Shiyan wrote:
>>>> This patch moves diagnostic messages used for debugging purposes
>>>> to dev_dbg().
> ...
>>>> @@ -1155,7 +1155,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
>>>>  
>>>
>>>>  	devm_can_led_init(net);
>>>>  
>>>> -	dev_info(&spi->dev, "probed\n");
>>>> +	dev_dbg(&spi->dev, "probed\n");
>>>
>>> This one could even be removed.
>>
>> +1
> 
> Resend this one modified patch?

yes, please

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]