[PATCH 0/4] treewide: Fix line continuation formats

[PATCH 0/4] treewide: Fix line continuation formats

[Joe Perches]

Avoid using line continations in formats as that causes unexpected
output.

Joe Perches (4):
  rk3399_dmc: Fix line continuation format
  drm: amd: Fix line continuation formats
  [media] dibx000_common: Fix line continuation format
  ima: Fix line continuation format

 drivers/devfreq/rk3399_dmc.c                       |  4 ++--
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   | 11 ++++-----
 .../amd/powerplay/hwmgr/process_pptables_v1_0.c    |  6 ++---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |  6 ++---
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |  9 +++-----
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  6 ++---
 drivers/media/dvb-frontends/dibx000_common.c       |  8 +++----
 security/integrity/ima/ima_template.c              | 11 ++++-----
 9 files changed, 33 insertions(+), 55 deletions(-)

-- 
2.15.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 0/4] treewide: Fix line continuation formats

[Joe Perches]

Avoid using line continations in formats as that causes unexpected
output.

Joe Perches (4):
  rk3399_dmc: Fix line continuation format
  drm: amd: Fix line continuation formats
  [media] dibx000_common: Fix line continuation format
  ima: Fix line continuation format

 drivers/devfreq/rk3399_dmc.c                       |  4 ++--
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   | 11 ++++-----
 .../amd/powerplay/hwmgr/process_pptables_v1_0.c    |  6 ++---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |  6 ++---
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |  9 +++-----
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  6 ++---
 drivers/media/dvb-frontends/dibx000_common.c       |  8 +++----
 security/integrity/ima/ima_template.c              | 11 ++++-----
 9 files changed, 33 insertions(+), 55 deletions(-)

-- 
2.15.0

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/4] treewide: Fix line continuation formats

[Joe Perches]

Avoid using line continations in formats as that causes unexpected
output.

Joe Perches (4):
  rk3399_dmc: Fix line continuation format
  drm: amd: Fix line continuation formats
  [media] dibx000_common: Fix line continuation format
  ima: Fix line continuation format

 drivers/devfreq/rk3399_dmc.c                       |  4 ++--
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   | 11 ++++-----
 .../amd/powerplay/hwmgr/process_pptables_v1_0.c    |  6 ++---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |  6 ++---
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |  9 +++-----
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  6 ++---
 drivers/media/dvb-frontends/dibx000_common.c       |  8 +++----
 security/integrity/ima/ima_template.c              | 11 ++++-----
 9 files changed, 33 insertions(+), 55 deletions(-)

-- 
2.15.0

[PATCH 1/4] rk3399_dmc: Fix line continuation format

[Joe Perches]

Line continuations with excess spacing causes unexpected output.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/devfreq/rk3399_dmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
index 5dfbfa3cc878..0938c97d46f0 100644
--- a/drivers/devfreq/rk3399_dmc.c
+++ b/drivers/devfreq/rk3399_dmc.c
@@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
 
 	/* If get the incorrect rate, set voltage to old value. */
 	if (dmcfreq->rate != target_rate) {
-		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
-			Current frequency %lu\n", target_rate, dmcfreq->rate);
+		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
+			target_rate, dmcfreq->rate);
 		regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt,
 				      dmcfreq->volt);
 		goto out;
-- 
2.15.0

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Chanwoo Choi]

On 2017년 11월 17일 00:27, Joe Perches wrote:
> Line continuations with excess spacing causes unexpected output.
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  drivers/devfreq/rk3399_dmc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
> index 5dfbfa3cc878..0938c97d46f0 100644
> --- a/drivers/devfreq/rk3399_dmc.c
> +++ b/drivers/devfreq/rk3399_dmc.c
> @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
>  
>  	/* If get the incorrect rate, set voltage to old value. */
>  	if (dmcfreq->rate != target_rate) {
> -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
> +			target_rate, dmcfreq->rate);

IMO, I don't like over 80 char in the one line.

>  		regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt,
>  				      dmcfreq->volt);
>  		goto out;
> 


-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Joe Perches]

On Wed, 2017-11-22 at 14:13 +0900, Chanwoo Choi wrote:
> On 2017년 11월 17일 00:27, Joe Perches wrote:
> > Line continuations with excess spacing causes unexpected output.
> > 
> > Signed-off-by: Joe Perches <joe@perches.com>
> > ---
> >  drivers/devfreq/rk3399_dmc.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
> > index 5dfbfa3cc878..0938c97d46f0 100644
> > --- a/drivers/devfreq/rk3399_dmc.c
> > +++ b/drivers/devfreq/rk3399_dmc.c
> > @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
> >  
> >  	/* If get the incorrect rate, set voltage to old value. */
> >  	if (dmcfreq->rate != target_rate) {
> > -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> > -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> > +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
> > +			target_rate, dmcfreq->rate);
> 
> IMO, I don't like over 80 char in the one line.

Fix it as you chose, but the code I proposed
is what is preferred by CodingStyle.

The current code is unintentional.

Right now there are 3 tabs between "Request frequency"
and "Current frequency" in the output.

> >  		regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt,
> >  				      dmcfreq->volt);
> >  		goto out;
> > 
> 
> 

RE: Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[MyungJoo Ham]

> On Wed, 2017-11-22 at 14:13 +0900, Chanwoo Choi wrote:
> > On 2017년 11월 17일 00:27, Joe Perches wrote:
> > > Line continuations with excess spacing causes unexpected output.
> > > 
> > > Signed-off-by: Joe Perches <joe@perches.com>
> > > ---
> > >  drivers/devfreq/rk3399_dmc.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
> > > index 5dfbfa3cc878..0938c97d46f0 100644
> > > --- a/drivers/devfreq/rk3399_dmc.c
> > > +++ b/drivers/devfreq/rk3399_dmc.c
> > > @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
> > >  
> > >  	/* If get the incorrect rate, set voltage to old value. */
> > >  	if (dmcfreq->rate != target_rate) {
> > > -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> > > -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> > > +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
> > > +			target_rate, dmcfreq->rate);
> > 
> > IMO, I don't like over 80 char in the one line.
> 
> Fix it as you chose, but the code I proposed
> is what is preferred by CodingStyle.
> 
> The current code is unintentional.
> 
> Right now there are 3 tabs between "Request frequency"
> and "Current frequency" in the output.

Chanwoo, this is not a simple coding style issue.
I'm seeing these unintentional tabs as well.

If you want to keep it 80 cols with strings (which is not mandatory for strings in double quotes),
We'd better do:

-		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
-			Current frequency %lu\n", target_rate, dmcfreq->rate);
+		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,"
+			" Current frequency %lu\n", target_rate, dmcfreq->rate);

Cheers,
MyungJoo

> 
> > >  		regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt,
> > >  				      dmcfreq->volt);
> > >  		goto out;
> > > 
> > 
> > 
> 

RE: Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[MyungJoo Ham]

> On Wed, 2017-11-22 at 14:13 +0900, Chanwoo Choi wrote:
> > On 2017년 11월 17일 00:27, Joe Perches wrote:
> > > Line continuations with excess spacing causes unexpected output.
> > > 
> > > Signed-off-by: Joe Perches <joe@perches.com>
> > > ---
> > >  drivers/devfreq/rk3399_dmc.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
> > > index 5dfbfa3cc878..0938c97d46f0 100644
> > > --- a/drivers/devfreq/rk3399_dmc.c
> > > +++ b/drivers/devfreq/rk3399_dmc.c
> > > @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
> > >  
> > >  	/* If get the incorrect rate, set voltage to old value. */
> > >  	if (dmcfreq->rate != target_rate) {
> > > -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> > > -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> > > +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
> > > +			target_rate, dmcfreq->rate);
> > 
> > IMO, I don't like over 80 char in the one line.
> 
> Fix it as you chose, but the code I proposed
> is what is preferred by CodingStyle.
> 
> The current code is unintentional.
> 
> Right now there are 3 tabs between "Request frequency"
> and "Current frequency" in the output.

Chanwoo, this is not a simple coding style issue.
I'm seeing these unintentional tabs as well.

If you want to keep it 80 cols with strings (which is not mandatory for strings in double quotes),
We'd better do:

-		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
-			Current frequency %lu\n", target_rate, dmcfreq->rate);
+		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,"
+			" Current frequency %lu\n", target_rate, dmcfreq->rate);

Cheers,
MyungJoo

> 
> > >  		regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt,
> > >  				      dmcfreq->volt);
> > >  		goto out;
> > > 
> > 
> > 
> 

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Chanwoo Choi]

On 2017년 11월 23일 10:21, MyungJoo Ham wrote:
>> On Wed, 2017-11-22 at 14:13 +0900, Chanwoo Choi wrote:
>>> On 2017년 11월 17일 00:27, Joe Perches wrote:
>>>> Line continuations with excess spacing causes unexpected output.
>>>>
>>>> Signed-off-by: Joe Perches <joe@perches.com>
>>>> ---
>>>>  drivers/devfreq/rk3399_dmc.c | 4 ++--
>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
>>>> index 5dfbfa3cc878..0938c97d46f0 100644
>>>> --- a/drivers/devfreq/rk3399_dmc.c
>>>> +++ b/drivers/devfreq/rk3399_dmc.c
>>>> @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
>>>>  
>>>>  	/* If get the incorrect rate, set voltage to old value. */
>>>>  	if (dmcfreq->rate != target_rate) {
>>>> -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
>>>> -			Current frequency %lu\n", target_rate, dmcfreq->rate);
>>>> +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
>>>> +			target_rate, dmcfreq->rate);
>>>
>>> IMO, I don't like over 80 char in the one line.
>>
>> Fix it as you chose, but the code I proposed
>> is what is preferred by CodingStyle.
>>
>> The current code is unintentional.
>>
>> Right now there are 3 tabs between "Request frequency"
>> and "Current frequency" in the output.
> 
> Chanwoo, this is not a simple coding style issue.
> I'm seeing these unintentional tabs as well.
> 
> If you want to keep it 80 cols with strings (which is not mandatory for strings in double quotes),
> We'd better do:
> 
> -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,"
> +			" Current frequency %lu\n", target_rate, dmcfreq->rate);

I agree with Myungjoo's opinion.
I think the readability is important. So, I prefer to keep one line within 80 char.

> 
> Cheers,
> MyungJoo
> 
>>
>>>>  		regulator_set_voltage(dmcfreq->vdd_center, dmcfreq->volt,
>>>>  				      dmcfreq->volt);
>>>>  		goto out;
>>>>
>>>
>>>
>>
> 
> 
> 


-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Joe Perches]

On Thu, 2017-11-23 at 10:45 +0900, Chanwoo Choi wrote:
> On 2017년 11월 23일 10:21, MyungJoo Ham wrote:
> > > On Wed, 2017-11-22 at 14:13 +0900, Chanwoo Choi wrote:
> > > > On 2017년 11월 17일 00:27, Joe Perches wrote:
> > > > > Line continuations with excess spacing causes unexpected output.
> > > > > 
> > > > > Signed-off-by: Joe Perches <joe@perches.com>
> > > > > ---
> > > > >  drivers/devfreq/rk3399_dmc.c | 4 ++--
> > > > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > > > 
> > > > > diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
> > > > > index 5dfbfa3cc878..0938c97d46f0 100644
> > > > > --- a/drivers/devfreq/rk3399_dmc.c
> > > > > +++ b/drivers/devfreq/rk3399_dmc.c
> > > > > @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
> > > > >  
> > > > >  	/* If get the incorrect rate, set voltage to old value. */
> > > > >  	if (dmcfreq->rate != target_rate) {
> > > > > -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> > > > > -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> > > > > +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
> > > > > +			target_rate, dmcfreq->rate);
> > > > 
> > > > IMO, I don't like over 80 char in the one line.
> > > 
> > > Fix it as you chose, but the code I proposed
> > > is what is preferred by CodingStyle.
> > > 
> > > The current code is unintentional.
> > > 
> > > Right now there are 3 tabs between "Request frequency"
> > > and "Current frequency" in the output.
> > 
> > Chanwoo, this is not a simple coding style issue.
> > I'm seeing these unintentional tabs as well.
> > 
> > 
> > If you want to keep it 80 cols with strings (which is r mandatory for strings in double quotes),
> > We'd better do:
> > 
> > -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> > -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> > +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,"
> > +			" Current frequency %lu\n", target_rate, dmcfreq->rate);
> 
> I agree with Myungjoo's opinion.
> I think the readability is important. So, I prefer to keep one line within 80 char.

Read Documentation/process/coding-style.rst

What I proposed is by far the common style.
I think you should get used to it.

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Chanwoo Choi]

On 2017년 11월 23일 11:07, Joe Perches wrote:
> On Thu, 2017-11-23 at 10:45 +0900, Chanwoo Choi wrote:
>> On 2017년 11월 23일 10:21, MyungJoo Ham wrote:
>>>> On Wed, 2017-11-22 at 14:13 +0900, Chanwoo Choi wrote:
>>>>> On 2017년 11월 17일 00:27, Joe Perches wrote:
>>>>>> Line continuations with excess spacing causes unexpected output.
>>>>>>
>>>>>> Signed-off-by: Joe Perches <joe@perches.com>
>>>>>> ---
>>>>>>  drivers/devfreq/rk3399_dmc.c | 4 ++--
>>>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>>
>>>>>> diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
>>>>>> index 5dfbfa3cc878..0938c97d46f0 100644
>>>>>> --- a/drivers/devfreq/rk3399_dmc.c
>>>>>> +++ b/drivers/devfreq/rk3399_dmc.c
>>>>>> @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
>>>>>>  
>>>>>>  	/* If get the incorrect rate, set voltage to old value. */
>>>>>>  	if (dmcfreq->rate != target_rate) {
>>>>>> -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
>>>>>> -			Current frequency %lu\n", target_rate, dmcfreq->rate);
>>>>>> +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
>>>>>> +			target_rate, dmcfreq->rate);
>>>>>
>>>>> IMO, I don't like over 80 char in the one line.
>>>>
>>>> Fix it as you chose, but the code I proposed
>>>> is what is preferred by CodingStyle.
>>>>
>>>> The current code is unintentional.
>>>>
>>>> Right now there are 3 tabs between "Request frequency"
>>>> and "Current frequency" in the output.
>>>
>>> Chanwoo, this is not a simple coding style issue.
>>> I'm seeing these unintentional tabs as well.
>>>
>>>
>>> If you want to keep it 80 cols with strings (which is r mandatory for strings in double quotes),
>>> We'd better do:
>>>
>>> -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
>>> -			Current frequency %lu\n", target_rate, dmcfreq->rate);
>>> +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,"
>>> +			" Current frequency %lu\n", target_rate, dmcfreq->rate);
>>
>> I agree with Myungjoo's opinion.
>> I think the readability is important. So, I prefer to keep one line within 80 char.
> 
> Read Documentation/process/coding-style.rst
> 
> What I proposed is by far the common style.
> I think you should get used to it.

Read line.81 in the Documentation/process/coding-style.rst
- "2) Breaking long lines and strings"

Or, we better to modify the error message within 80 char.

-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Joe Perches]

On Thu, 2017-11-23 at 11:12 +0900, Chanwoo Choi wrote:
> On 2017년 11월 23일 11:07, Joe Perches wrote:
> > On Thu, 2017-11-23 at 10:45 +0900, Chanwoo Choi wrote:
> > > On 2017년 11월 23일 10:21, MyungJoo Ham wrote:
> > > > > On Wed, 2017-11-22 at 14:13 +0900, Chanwoo Choi wrote:
> > > > > > On 2017년 11월 17일 00:27, Joe Perches wrote:
> > > > > > > Line continuations with excess spacing causes unexpected output.
> > > > > > > 
> > > > > > > Signed-off-by: Joe Perches <joe@perches.com>
> > > > > > > ---
> > > > > > >  drivers/devfreq/rk3399_dmc.c | 4 ++--
> > > > > > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > > > > > 
> > > > > > > diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
> > > > > > > index 5dfbfa3cc878..0938c97d46f0 100644
> > > > > > > --- a/drivers/devfreq/rk3399_dmc.c
> > > > > > > +++ b/drivers/devfreq/rk3399_dmc.c
> > > > > > > @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
> > > > > > >  
> > > > > > >  	/* If get the incorrect rate, set voltage to old value. */
> > > > > > >  	if (dmcfreq->rate != target_rate) {
> > > > > > > -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> > > > > > > -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> > > > > > > +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
> > > > > > > +			target_rate, dmcfreq->rate);
> > > > > > 
> > > > > > IMO, I don't like over 80 char in the one line.
> > > > > 
> > > > > Fix it as you chose, but the code I proposed
> > > > > is what is preferred by CodingStyle.
> > > > > 
> > > > > The current code is unintentional.
> > > > > 
> > > > > Right now there are 3 tabs between "Request frequency"
> > > > > and "Current frequency" in the output.
> > > > 
> > > > Chanwoo, this is not a simple coding style issue.
> > > > I'm seeing these unintentional tabs as well.
> > > > 
> > > > 
> > > > If you want to keep it 80 cols with strings (which is r mandatory for strings in double quotes),
> > > > We'd better do:
> > > > 
> > > > -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
> > > > -			Current frequency %lu\n", target_rate, dmcfreq->rate);
> > > > +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,"
> > > > +			" Current frequency %lu\n", target_rate, dmcfreq->rate);
> > > 
> > > I agree with Myungjoo's opinion.
> > > I think the readability is important. So, I prefer to keep one line within 80 char.
> > 
> > Read Documentation/process/coding-style.rst
> > 
> > What I proposed is by far the common style.
> > I think you should get used to it.
> 
> Read line.81 in the Documentation/process/coding-style.rst
> - "2) Breaking long lines and strings"
> 
> Or, we better to modify the error message within 80 char.

Exactly!

line 94:

never break user-visible strings such as
printk messages, because that breaks the ability to grep for them

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Chanwoo Choi]

On 2017년 11월 23일 11:18, Joe Perches wrote:
> On Thu, 2017-11-23 at 11:12 +0900, Chanwoo Choi wrote:
>> On 2017년 11월 23일 11:07, Joe Perches wrote:
>>> On Thu, 2017-11-23 at 10:45 +0900, Chanwoo Choi wrote:
>>>> On 2017년 11월 23일 10:21, MyungJoo Ham wrote:
>>>>>> On Wed, 2017-11-22 at 14:13 +0900, Chanwoo Choi wrote:
>>>>>>> On 2017년 11월 17일 00:27, Joe Perches wrote:
>>>>>>>> Line continuations with excess spacing causes unexpected output.
>>>>>>>>
>>>>>>>> Signed-off-by: Joe Perches <joe@perches.com>
>>>>>>>> ---
>>>>>>>>  drivers/devfreq/rk3399_dmc.c | 4 ++--
>>>>>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
>>>>>>>> index 5dfbfa3cc878..0938c97d46f0 100644
>>>>>>>> --- a/drivers/devfreq/rk3399_dmc.c
>>>>>>>> +++ b/drivers/devfreq/rk3399_dmc.c
>>>>>>>> @@ -146,8 +146,8 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,
>>>>>>>>  
>>>>>>>>  	/* If get the incorrect rate, set voltage to old value. */
>>>>>>>>  	if (dmcfreq->rate != target_rate) {
>>>>>>>> -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
>>>>>>>> -			Current frequency %lu\n", target_rate, dmcfreq->rate);
>>>>>>>> +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu, Current frequency %lu\n",
>>>>>>>> +			target_rate, dmcfreq->rate);
>>>>>>>
>>>>>>> IMO, I don't like over 80 char in the one line.
>>>>>>
>>>>>> Fix it as you chose, but the code I proposed
>>>>>> is what is preferred by CodingStyle.
>>>>>>
>>>>>> The current code is unintentional.
>>>>>>
>>>>>> Right now there are 3 tabs between "Request frequency"
>>>>>> and "Current frequency" in the output.
>>>>>
>>>>> Chanwoo, this is not a simple coding style issue.
>>>>> I'm seeing these unintentional tabs as well.
>>>>>
>>>>>
>>>>> If you want to keep it 80 cols with strings (which is r mandatory for strings in double quotes),
>>>>> We'd better do:
>>>>>
>>>>> -		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,\
>>>>> -			Current frequency %lu\n", target_rate, dmcfreq->rate);
>>>>> +		dev_err(dev, "Get wrong ddr frequency, Request frequency %lu,"
>>>>> +			" Current frequency %lu\n", target_rate, dmcfreq->rate);
>>>>
>>>> I agree with Myungjoo's opinion.
>>>> I think the readability is important. So, I prefer to keep one line within 80 char.
>>>
>>> Read Documentation/process/coding-style.rst
>>>
>>> What I proposed is by far the common style.
>>> I think you should get used to it.
>>
>> Read line.81 in the Documentation/process/coding-style.rst
>> - "2) Breaking long lines and strings"
>>
>> Or, we better to modify the error message within 80 char.
> 
> Exactly!
> 
> line 94:
> 
> never break user-visible strings such as
> printk messages, because that breaks the ability to grep for them

So, I suggested "Or, we better to modify the error message within 80 char.".

-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Joe Perches]

On Thu, 2017-11-23 at 11:23 +0900, Chanwoo Choi wrote:
> On 2017년 11월 23일 11:18, Joe Perches wrote:
> > never break user-visible strings such as
> > printk messages, because that breaks the ability to grep for them
> 
> So, I suggested "Or, we better to modify the error message within 80 char.".

Run checkpatch on your suggestion.
You will get a "split_string" warning.

cheers, Joe

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Chanwoo Choi]

On 2017년 11월 23일 11:29, Joe Perches wrote:
> On Thu, 2017-11-23 at 11:23 +0900, Chanwoo Choi wrote:
>> On 2017년 11월 23일 11:18, Joe Perches wrote:
>>> never break user-visible strings such as
>>> printk messages, because that breaks the ability to grep for them
>>
>> So, I suggested "Or, we better to modify the error message within 80 char.".
> 
> Run checkpatch on your suggestion.
> You will get a "split_string" warning.

I knew about this. I don't like to hurt the readability
in order to fix the warning with the improper way.

If you want to fix it, I suggested that you better to modify
the error message within 80 char. Or I prefer the Myungjoo's opinion.

-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

Re: [PATCH 1/4] rk3399_dmc: Fix line continuation format

[Joe Perches]

On Thu, 2017-11-23 at 11:35 +0900, Chanwoo Choi wrote:
> On 2017년 11월 23일 11:29, Joe Perches wrote:
> > On Thu, 2017-11-23 at 11:23 +0900, Chanwoo Choi wrote:
> > > On 2017년 11월 23일 11:18, Joe Perches wrote:
> > > > never break user-visible strings such as
> > > > printk messages, because that breaks the ability to grep for them
> > > 
> > > So, I suggested "Or, we better to modify the error message within 80 char.".
> > 
> > Run checkpatch on your suggestion.
> > You will get a "split_string" warning.
> 
> I knew about this. I don't like to hurt the readability
> in order to fix the warning with the improper way.
> 
> If you want to fix it, I suggested that you better to modify
> the error message within 80 char. Or I prefer the Myungjoo's opinion.

Again, I don't really care how it's fixed,
but the 3 tabs in the middle of the message
are stupid.

Please fix it.

[PATCH 2/4] drm: amd: Fix line continuation formats

[Joe Perches]

Line continuations with excess spacing causes unexpected output.

Miscellanea:

o Added missing '\n' to a few of the coalesced pr_<level> formats

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   | 11 ++++-----
 .../amd/powerplay/hwmgr/process_pptables_v1_0.c    |  6 ++---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |  6 ++---
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |  9 +++-----
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  6 ++---
 6 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index ced42484dcfc..6743786afcce 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -220,8 +220,7 @@ static void dpcd_set_lt_pattern_and_lane_settings(
 		size_in_bytes);
 
 	dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
-		"%s:\n %x VS set = %x  PE set = %x \
-		max VS Reached = %x  max PE Reached = %x\n",
+		"%s:\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
 		__func__,
 		DP_TRAINING_LANE0_SET,
 		dpcd_lane[0].bits.VOLTAGE_SWING_SET,
@@ -558,8 +557,7 @@ static void dpcd_set_lane_settings(
 	*/
 
 	dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
-		"%s\n %x VS set = %x  PE set = %x \
-		max VS Reached = %x  max PE Reached = %x\n",
+		"%s\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
 		__func__,
 		DP_TRAINING_LANE0_SET,
 		dpcd_lane[0].bits.VOLTAGE_SWING_SET,
@@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
 	if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
 		ASSERT(0);
 		dm_logger_write(link->ctx->logger, LOG_ERROR,
-			"%s: Link Training Error, could not \
-			 get CR after %d tries. \
-			Possibly voltage swing issue", __func__,
+			"%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",
+			__func__,
 			LINK_TRAINING_MAX_CR_RETRY);
 
 	}
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
index d1af1483c69b..813f827e4270 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
@@ -523,8 +523,7 @@ static int get_pcie_table(
 		if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
 			pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
 		else
-			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
-			Disregarding the excess entries... \n");
+			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
 
 		pcie_table->count = pcie_count;
 		for (i = 0; i < pcie_count; i++) {
@@ -563,8 +562,7 @@ static int get_pcie_table(
 		if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
 			pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
 		else
-			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
-			Disregarding the excess entries... \n");
+			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
 
 		pcie_table->count = pcie_count;
 
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index 4f79c21f27ed..9599fe0ba779 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -546,8 +546,7 @@ static void vega10_patch_with_vdd_leakage(struct pp_hwmgr *hwmgr,
 	}
 
 	if (*voltage > ATOM_VIRTUAL_VOLTAGE_ID0)
-		pr_info("Voltage value looks like a Leakage ID \
-				but it's not patched\n");
+		pr_info("Voltage value looks like a Leakage ID but it's not patched\n");
 }
 
 /**
@@ -701,18 +700,14 @@ static int vega10_set_private_data_based_on_pptable(struct pp_hwmgr *hwmgr)
 			table_info->vdd_dep_on_mclk;
 
 	PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table,
-		"VDD dependency on SCLK table is missing. \
-		This table is mandatory", return -EINVAL);
+		"VDD dependency on SCLK table is missing. This table is mandatory", return -EINVAL);
 	PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1,
-		"VDD dependency on SCLK table is empty. \
-		This table is mandatory", return -EINVAL);
+		"VDD dependency on SCLK table is empty. This table is mandatory", return -EINVAL);
 
 	PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table,
-		"VDD dependency on MCLK table is missing. \
-		This table is mandatory", return -EINVAL);
+		"VDD dependency on MCLK table is missing.  This table is mandatory", return -EINVAL);
 	PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1,
-		"VDD dependency on MCLK table is empty. \
-		This table is mandatory", return -EINVAL);
+		"VDD dependency on MCLK table is empty.  This table is mandatory", return -EINVAL);
 
 	table_info->max_clock_voltage_on_ac.sclk =
 		allowed_sclk_vdd_table->entries[allowed_sclk_vdd_table->count - 1].clk;
@@ -3415,8 +3410,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
 					DPMTABLE_OD_UPDATE_SCLK)) {
 			result = vega10_populate_all_graphic_levels(hwmgr);
 			PP_ASSERT_WITH_CODE(!result,
-					"Failed to populate SCLK during \
-					PopulateNewDPMClocksStates Function!",
+					"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
 					return result);
 		}
 
@@ -3425,8 +3419,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
 					DPMTABLE_OD_UPDATE_MCLK)){
 			result = vega10_populate_all_memory_levels(hwmgr);
 			PP_ASSERT_WITH_CODE(!result,
-					"Failed to populate MCLK during \
-					PopulateNewDPMClocksStates Function!",
+					"Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
 					return result);
 		}
 	} else {
@@ -3543,8 +3536,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
 			data->apply_optimized_settings) {
 			result = vega10_populate_all_graphic_levels(hwmgr);
 			PP_ASSERT_WITH_CODE(!result,
-					"Failed to populate SCLK during \
-					PopulateNewDPMClocksStates Function!",
+					"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
 					return result);
 		}
 
@@ -3552,8 +3544,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
 				(DPMTABLE_OD_UPDATE_MCLK + DPMTABLE_UPDATE_MCLK)) {
 			result = vega10_populate_all_memory_levels(hwmgr);
 			PP_ASSERT_WITH_CODE(!result,
-					"Failed to populate MCLK during \
-					PopulateNewDPMClocksStates Function!",
+					"Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
 					return result);
 		}
 	}
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
index 4d672cd15785..ed4b37e566a3 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
@@ -1732,8 +1732,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
 	if (0 != result) {
 		smu_data->smc_state_table.GraphicsBootLevel = 0;
-		pr_err("VBIOS did not find boot engine clock value \
-			in dependency table. Using Graphics DPM level 0!");
+		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
 		result = 0;
 	}
 
@@ -1743,8 +1742,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
 	if (0 != result) {
 		smu_data->smc_state_table.MemoryBootLevel = 0;
-		pr_err("VBIOS did not find boot engine clock value \
-			in dependency table. Using Memory DPM level 0!");
+		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
 		result = 0;
 	}
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
index 34128822b8fb..2ff682d44e8c 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
@@ -911,8 +911,7 @@ static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
 		hwmgr->dyn_state.vddc_dependency_on_sclk, engine_clock,
 		&graphic_level->MinVddc);
 	PP_ASSERT_WITH_CODE((0 == result),
-		"can not find VDDC voltage value for VDDC	\
-		engine clock dependency table", return result);
+		"can not find VDDC voltage value for VDDC engine clock dependency table", return result);
 
 	/* SCLK frequency in units of 10KHz*/
 	graphic_level->SclkFrequency = engine_clock;
@@ -1678,8 +1677,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
 	if (0 != result) {
 		smu_data->smc_state_table.GraphicsBootLevel = 0;
-		pr_err("VBIOS did not find boot engine clock value \
-			in dependency table. Using Graphics DPM level 0!");
+		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
 		result = 0;
 	}
 
@@ -1689,8 +1687,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
 	if (0 != result) {
 		smu_data->smc_state_table.MemoryBootLevel = 0;
-		pr_err("VBIOS did not find boot engine clock value \
-			in dependency table. Using Memory DPM level 0!");
+		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
 		result = 0;
 	}
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
index 2f979fb86824..f6f39d01d227 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
@@ -381,10 +381,8 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr)
 		(rev_id == 0xc1) ||
 		(rev_id == 0xc3)))) {
 		if (smc_driver_if_version != SMU9_DRIVER_IF_VERSION) {
-			pr_err("Your firmware(0x%x) doesn't match \
-				SMU9_DRIVER_IF_VERSION(0x%x). \
-				Please update your firmware!\n",
-				smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
+			pr_err("Your firmware(0x%x) doesn't match SMU9_DRIVER_IF_VERSION(0x%x). Please update your firmware!\n",
+			       smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
 			return -EINVAL;
 		}
 	}
-- 
2.15.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/4] drm: amd: Fix line continuation formats

[Joe Perches]

Line continuations with excess spacing causes unexpected output.

Miscellanea:

o Added missing '\n' to a few of the coalesced pr_<level> formats

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   | 11 ++++-----
 .../amd/powerplay/hwmgr/process_pptables_v1_0.c    |  6 ++---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |  6 ++---
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |  9 +++-----
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  6 ++---
 6 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index ced42484dcfc..6743786afcce 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -220,8 +220,7 @@ static void dpcd_set_lt_pattern_and_lane_settings(
 		size_in_bytes);
 
 	dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
-		"%s:\n %x VS set = %x  PE set = %x \
-		max VS Reached = %x  max PE Reached = %x\n",
+		"%s:\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
 		__func__,
 		DP_TRAINING_LANE0_SET,
 		dpcd_lane[0].bits.VOLTAGE_SWING_SET,
@@ -558,8 +557,7 @@ static void dpcd_set_lane_settings(
 	*/
 
 	dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
-		"%s\n %x VS set = %x  PE set = %x \
-		max VS Reached = %x  max PE Reached = %x\n",
+		"%s\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
 		__func__,
 		DP_TRAINING_LANE0_SET,
 		dpcd_lane[0].bits.VOLTAGE_SWING_SET,
@@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
 	if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
 		ASSERT(0);
 		dm_logger_write(link->ctx->logger, LOG_ERROR,
-			"%s: Link Training Error, could not \
-			 get CR after %d tries. \
-			Possibly voltage swing issue", __func__,
+			"%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",
+			__func__,
 			LINK_TRAINING_MAX_CR_RETRY);
 
 	}
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
index d1af1483c69b..813f827e4270 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
@@ -523,8 +523,7 @@ static int get_pcie_table(
 		if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
 			pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
 		else
-			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
-			Disregarding the excess entries... \n");
+			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
 
 		pcie_table->count = pcie_count;
 		for (i = 0; i < pcie_count; i++) {
@@ -563,8 +562,7 @@ static int get_pcie_table(
 		if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
 			pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
 		else
-			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
-			Disregarding the excess entries... \n");
+			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
 
 		pcie_table->count = pcie_count;
 
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index 4f79c21f27ed..9599fe0ba779 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -546,8 +546,7 @@ static void vega10_patch_with_vdd_leakage(struct pp_hwmgr *hwmgr,
 	}
 
 	if (*voltage > ATOM_VIRTUAL_VOLTAGE_ID0)
-		pr_info("Voltage value looks like a Leakage ID \
-				but it's not patched\n");
+		pr_info("Voltage value looks like a Leakage ID but it's not patched\n");
 }
 
 /**
@@ -701,18 +700,14 @@ static int vega10_set_private_data_based_on_pptable(struct pp_hwmgr *hwmgr)
 			table_info->vdd_dep_on_mclk;
 
 	PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table,
-		"VDD dependency on SCLK table is missing. \
-		This table is mandatory", return -EINVAL);
+		"VDD dependency on SCLK table is missing. This table is mandatory", return -EINVAL);
 	PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1,
-		"VDD dependency on SCLK table is empty. \
-		This table is mandatory", return -EINVAL);
+		"VDD dependency on SCLK table is empty. This table is mandatory", return -EINVAL);
 
 	PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table,
-		"VDD dependency on MCLK table is missing. \
-		This table is mandatory", return -EINVAL);
+		"VDD dependency on MCLK table is missing.  This table is mandatory", return -EINVAL);
 	PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1,
-		"VDD dependency on MCLK table is empty. \
-		This table is mandatory", return -EINVAL);
+		"VDD dependency on MCLK table is empty.  This table is mandatory", return -EINVAL);
 
 	table_info->max_clock_voltage_on_ac.sclk =
 		allowed_sclk_vdd_table->entries[allowed_sclk_vdd_table->count - 1].clk;
@@ -3415,8 +3410,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
 					DPMTABLE_OD_UPDATE_SCLK)) {
 			result = vega10_populate_all_graphic_levels(hwmgr);
 			PP_ASSERT_WITH_CODE(!result,
-					"Failed to populate SCLK during \
-					PopulateNewDPMClocksStates Function!",
+					"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
 					return result);
 		}
 
@@ -3425,8 +3419,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
 					DPMTABLE_OD_UPDATE_MCLK)){
 			result = vega10_populate_all_memory_levels(hwmgr);
 			PP_ASSERT_WITH_CODE(!result,
-					"Failed to populate MCLK during \
-					PopulateNewDPMClocksStates Function!",
+					"Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
 					return result);
 		}
 	} else {
@@ -3543,8 +3536,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
 			data->apply_optimized_settings) {
 			result = vega10_populate_all_graphic_levels(hwmgr);
 			PP_ASSERT_WITH_CODE(!result,
-					"Failed to populate SCLK during \
-					PopulateNewDPMClocksStates Function!",
+					"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
 					return result);
 		}
 
@@ -3552,8 +3544,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
 				(DPMTABLE_OD_UPDATE_MCLK + DPMTABLE_UPDATE_MCLK)) {
 			result = vega10_populate_all_memory_levels(hwmgr);
 			PP_ASSERT_WITH_CODE(!result,
-					"Failed to populate MCLK during \
-					PopulateNewDPMClocksStates Function!",
+					"Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
 					return result);
 		}
 	}
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
index 4d672cd15785..ed4b37e566a3 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
@@ -1732,8 +1732,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
 	if (0 != result) {
 		smu_data->smc_state_table.GraphicsBootLevel = 0;
-		pr_err("VBIOS did not find boot engine clock value \
-			in dependency table. Using Graphics DPM level 0!");
+		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
 		result = 0;
 	}
 
@@ -1743,8 +1742,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
 	if (0 != result) {
 		smu_data->smc_state_table.MemoryBootLevel = 0;
-		pr_err("VBIOS did not find boot engine clock value \
-			in dependency table. Using Memory DPM level 0!");
+		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
 		result = 0;
 	}
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
index 34128822b8fb..2ff682d44e8c 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
@@ -911,8 +911,7 @@ static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
 		hwmgr->dyn_state.vddc_dependency_on_sclk, engine_clock,
 		&graphic_level->MinVddc);
 	PP_ASSERT_WITH_CODE((0 == result),
-		"can not find VDDC voltage value for VDDC	\
-		engine clock dependency table", return result);
+		"can not find VDDC voltage value for VDDC engine clock dependency table", return result);
 
 	/* SCLK frequency in units of 10KHz*/
 	graphic_level->SclkFrequency = engine_clock;
@@ -1678,8 +1677,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
 	if (0 != result) {
 		smu_data->smc_state_table.GraphicsBootLevel = 0;
-		pr_err("VBIOS did not find boot engine clock value \
-			in dependency table. Using Graphics DPM level 0!");
+		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
 		result = 0;
 	}
 
@@ -1689,8 +1687,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
 	if (0 != result) {
 		smu_data->smc_state_table.MemoryBootLevel = 0;
-		pr_err("VBIOS did not find boot engine clock value \
-			in dependency table. Using Memory DPM level 0!");
+		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
 		result = 0;
 	}
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
index 2f979fb86824..f6f39d01d227 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
@@ -381,10 +381,8 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr)
 		(rev_id == 0xc1) ||
 		(rev_id == 0xc3)))) {
 		if (smc_driver_if_version != SMU9_DRIVER_IF_VERSION) {
-			pr_err("Your firmware(0x%x) doesn't match \
-				SMU9_DRIVER_IF_VERSION(0x%x). \
-				Please update your firmware!\n",
-				smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
+			pr_err("Your firmware(0x%x) doesn't match SMU9_DRIVER_IF_VERSION(0x%x). Please update your firmware!\n",
+			       smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
 			return -EINVAL;
 		}
 	}
-- 
2.15.0

Re: [PATCH 2/4] drm: amd: Fix line continuation formats

[Harry Wentland]

On 2017-11-16 10:27 AM, Joe Perches wrote:
> Line continuations with excess spacing causes unexpected output.
> 
> Miscellanea:
> 
> o Added missing '\n' to a few of the coalesced pr_<level> formats
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   | 11 ++++-----
>  .../amd/powerplay/hwmgr/process_pptables_v1_0.c    |  6 ++---
>  drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
>  drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |  6 ++---
>  .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |  9 +++-----
>  .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  6 ++---
>  6 files changed, 22 insertions(+), 43 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> index ced42484dcfc..6743786afcce 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> @@ -220,8 +220,7 @@ static void dpcd_set_lt_pattern_and_lane_settings(
>  		size_in_bytes);
>  
>  	dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
> -		"%s:\n %x VS set = %x  PE set = %x \
> -		max VS Reached = %x  max PE Reached = %x\n",
> +		"%s:\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
>  		__func__,
>  		DP_TRAINING_LANE0_SET,
>  		dpcd_lane[0].bits.VOLTAGE_SWING_SET,
> @@ -558,8 +557,7 @@ static void dpcd_set_lane_settings(
>  	*/
>  
>  	dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
> -		"%s\n %x VS set = %x  PE set = %x \
> -		max VS Reached = %x  max PE Reached = %x\n",
> +		"%s\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
>  		__func__,
>  		DP_TRAINING_LANE0_SET,
>  		dpcd_lane[0].bits.VOLTAGE_SWING_SET,
> @@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
>  	if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
>  		ASSERT(0);
>  		dm_logger_write(link->ctx->logger, LOG_ERROR,
> -			"%s: Link Training Error, could not \
> -			 get CR after %d tries. \
> -			Possibly voltage swing issue", __func__,
> +			"%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",

Would probably be good to add a '\n' here as well but that's not the main intention of this patch.

Either way patch is
Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> +			__func__,
>  			LINK_TRAINING_MAX_CR_RETRY);
>  
>  	}
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
> index d1af1483c69b..813f827e4270 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
> @@ -523,8 +523,7 @@ static int get_pcie_table(
>  		if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
>  			pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
>  		else
> -			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
> -			Disregarding the excess entries... \n");
> +			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
>  
>  		pcie_table->count = pcie_count;
>  		for (i = 0; i < pcie_count; i++) {
> @@ -563,8 +562,7 @@ static int get_pcie_table(
>  		if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
>  			pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
>  		else
> -			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
> -			Disregarding the excess entries... \n");
> +			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
>  
>  		pcie_table->count = pcie_count;
>  
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> index 4f79c21f27ed..9599fe0ba779 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> @@ -546,8 +546,7 @@ static void vega10_patch_with_vdd_leakage(struct pp_hwmgr *hwmgr,
>  	}
>  
>  	if (*voltage > ATOM_VIRTUAL_VOLTAGE_ID0)
> -		pr_info("Voltage value looks like a Leakage ID \
> -				but it's not patched\n");
> +		pr_info("Voltage value looks like a Leakage ID but it's not patched\n");
>  }
>  
>  /**
> @@ -701,18 +700,14 @@ static int vega10_set_private_data_based_on_pptable(struct pp_hwmgr *hwmgr)
>  			table_info->vdd_dep_on_mclk;
>  
>  	PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table,
> -		"VDD dependency on SCLK table is missing. \
> -		This table is mandatory", return -EINVAL);
> +		"VDD dependency on SCLK table is missing. This table is mandatory", return -EINVAL);
>  	PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1,
> -		"VDD dependency on SCLK table is empty. \
> -		This table is mandatory", return -EINVAL);
> +		"VDD dependency on SCLK table is empty. This table is mandatory", return -EINVAL);
>  
>  	PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table,
> -		"VDD dependency on MCLK table is missing. \
> -		This table is mandatory", return -EINVAL);
> +		"VDD dependency on MCLK table is missing.  This table is mandatory", return -EINVAL);
>  	PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1,
> -		"VDD dependency on MCLK table is empty. \
> -		This table is mandatory", return -EINVAL);
> +		"VDD dependency on MCLK table is empty.  This table is mandatory", return -EINVAL);
>  
>  	table_info->max_clock_voltage_on_ac.sclk =
>  		allowed_sclk_vdd_table->entries[allowed_sclk_vdd_table->count - 1].clk;
> @@ -3415,8 +3410,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
>  					DPMTABLE_OD_UPDATE_SCLK)) {
>  			result = vega10_populate_all_graphic_levels(hwmgr);
>  			PP_ASSERT_WITH_CODE(!result,
> -					"Failed to populate SCLK during \
> -					PopulateNewDPMClocksStates Function!",
> +					"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
>  					return result);
>  		}
>  
> @@ -3425,8 +3419,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
>  					DPMTABLE_OD_UPDATE_MCLK)){
>  			result = vega10_populate_all_memory_levels(hwmgr);
>  			PP_ASSERT_WITH_CODE(!result,
> -					"Failed to populate MCLK during \
> -					PopulateNewDPMClocksStates Function!",
> +					"Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
>  					return result);
>  		}
>  	} else {
> @@ -3543,8 +3536,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
>  			data->apply_optimized_settings) {
>  			result = vega10_populate_all_graphic_levels(hwmgr);
>  			PP_ASSERT_WITH_CODE(!result,
> -					"Failed to populate SCLK during \
> -					PopulateNewDPMClocksStates Function!",
> +					"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
>  					return result);
>  		}
>  
> @@ -3552,8 +3544,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
>  				(DPMTABLE_OD_UPDATE_MCLK + DPMTABLE_UPDATE_MCLK)) {
>  			result = vega10_populate_all_memory_levels(hwmgr);
>  			PP_ASSERT_WITH_CODE(!result,
> -					"Failed to populate MCLK during \
> -					PopulateNewDPMClocksStates Function!",
> +					"Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
>  					return result);
>  		}
>  	}
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> index 4d672cd15785..ed4b37e566a3 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> @@ -1732,8 +1732,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>  
>  	if (0 != result) {
>  		smu_data->smc_state_table.GraphicsBootLevel = 0;
> -		pr_err("VBIOS did not find boot engine clock value \
> -			in dependency table. Using Graphics DPM level 0!");
> +		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
>  		result = 0;
>  	}
>  
> @@ -1743,8 +1742,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>  
>  	if (0 != result) {
>  		smu_data->smc_state_table.MemoryBootLevel = 0;
> -		pr_err("VBIOS did not find boot engine clock value \
> -			in dependency table. Using Memory DPM level 0!");
> +		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
>  		result = 0;
>  	}
>  
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> index 34128822b8fb..2ff682d44e8c 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> @@ -911,8 +911,7 @@ static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
>  		hwmgr->dyn_state.vddc_dependency_on_sclk, engine_clock,
>  		&graphic_level->MinVddc);
>  	PP_ASSERT_WITH_CODE((0 == result),
> -		"can not find VDDC voltage value for VDDC	\
> -		engine clock dependency table", return result);
> +		"can not find VDDC voltage value for VDDC engine clock dependency table", return result);
>  
>  	/* SCLK frequency in units of 10KHz*/
>  	graphic_level->SclkFrequency = engine_clock;
> @@ -1678,8 +1677,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>  
>  	if (0 != result) {
>  		smu_data->smc_state_table.GraphicsBootLevel = 0;
> -		pr_err("VBIOS did not find boot engine clock value \
> -			in dependency table. Using Graphics DPM level 0!");
> +		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
>  		result = 0;
>  	}
>  
> @@ -1689,8 +1687,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>  
>  	if (0 != result) {
>  		smu_data->smc_state_table.MemoryBootLevel = 0;
> -		pr_err("VBIOS did not find boot engine clock value \
> -			in dependency table. Using Memory DPM level 0!");
> +		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
>  		result = 0;
>  	}
>  
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
> index 2f979fb86824..f6f39d01d227 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
> @@ -381,10 +381,8 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr)
>  		(rev_id == 0xc1) ||
>  		(rev_id == 0xc3)))) {
>  		if (smc_driver_if_version != SMU9_DRIVER_IF_VERSION) {
> -			pr_err("Your firmware(0x%x) doesn't match \
> -				SMU9_DRIVER_IF_VERSION(0x%x). \
> -				Please update your firmware!\n",
> -				smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
> +			pr_err("Your firmware(0x%x) doesn't match SMU9_DRIVER_IF_VERSION(0x%x). Please update your firmware!\n",
> +			       smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
>  			return -EINVAL;
>  		}
>  	}
> 
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/4] drm: amd: Fix line continuation formats

[Harry Wentland]

On 2017-11-16 10:27 AM, Joe Perches wrote:
> Line continuations with excess spacing causes unexpected output.
> 
> Miscellanea:
> 
> o Added missing '\n' to a few of the coalesced pr_<level> formats
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   | 11 ++++-----
>  .../amd/powerplay/hwmgr/process_pptables_v1_0.c    |  6 ++---
>  drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
>  drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |  6 ++---
>  .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |  9 +++-----
>  .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |  6 ++---
>  6 files changed, 22 insertions(+), 43 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> index ced42484dcfc..6743786afcce 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> @@ -220,8 +220,7 @@ static void dpcd_set_lt_pattern_and_lane_settings(
>  		size_in_bytes);
>  
>  	dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
> -		"%s:\n %x VS set = %x  PE set = %x \
> -		max VS Reached = %x  max PE Reached = %x\n",
> +		"%s:\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
>  		__func__,
>  		DP_TRAINING_LANE0_SET,
>  		dpcd_lane[0].bits.VOLTAGE_SWING_SET,
> @@ -558,8 +557,7 @@ static void dpcd_set_lane_settings(
>  	*/
>  
>  	dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
> -		"%s\n %x VS set = %x  PE set = %x \
> -		max VS Reached = %x  max PE Reached = %x\n",
> +		"%s\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
>  		__func__,
>  		DP_TRAINING_LANE0_SET,
>  		dpcd_lane[0].bits.VOLTAGE_SWING_SET,
> @@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
>  	if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
>  		ASSERT(0);
>  		dm_logger_write(link->ctx->logger, LOG_ERROR,
> -			"%s: Link Training Error, could not \
> -			 get CR after %d tries. \
> -			Possibly voltage swing issue", __func__,
> +			"%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",

Would probably be good to add a '\n' here as well but that's not the main intention of this patch.

Either way patch is
Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> +			__func__,
>  			LINK_TRAINING_MAX_CR_RETRY);
>  
>  	}
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
> index d1af1483c69b..813f827e4270 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
> @@ -523,8 +523,7 @@ static int get_pcie_table(
>  		if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
>  			pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
>  		else
> -			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
> -			Disregarding the excess entries... \n");
> +			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
>  
>  		pcie_table->count = pcie_count;
>  		for (i = 0; i < pcie_count; i++) {
> @@ -563,8 +562,7 @@ static int get_pcie_table(
>  		if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
>  			pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
>  		else
> -			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
> -			Disregarding the excess entries... \n");
> +			pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
>  
>  		pcie_table->count = pcie_count;
>  
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> index 4f79c21f27ed..9599fe0ba779 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
> @@ -546,8 +546,7 @@ static void vega10_patch_with_vdd_leakage(struct pp_hwmgr *hwmgr,
>  	}
>  
>  	if (*voltage > ATOM_VIRTUAL_VOLTAGE_ID0)
> -		pr_info("Voltage value looks like a Leakage ID \
> -				but it's not patched\n");
> +		pr_info("Voltage value looks like a Leakage ID but it's not patched\n");
>  }
>  
>  /**
> @@ -701,18 +700,14 @@ static int vega10_set_private_data_based_on_pptable(struct pp_hwmgr *hwmgr)
>  			table_info->vdd_dep_on_mclk;
>  
>  	PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table,
> -		"VDD dependency on SCLK table is missing. \
> -		This table is mandatory", return -EINVAL);
> +		"VDD dependency on SCLK table is missing. This table is mandatory", return -EINVAL);
>  	PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1,
> -		"VDD dependency on SCLK table is empty. \
> -		This table is mandatory", return -EINVAL);
> +		"VDD dependency on SCLK table is empty. This table is mandatory", return -EINVAL);
>  
>  	PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table,
> -		"VDD dependency on MCLK table is missing. \
> -		This table is mandatory", return -EINVAL);
> +		"VDD dependency on MCLK table is missing.  This table is mandatory", return -EINVAL);
>  	PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1,
> -		"VDD dependency on MCLK table is empty. \
> -		This table is mandatory", return -EINVAL);
> +		"VDD dependency on MCLK table is empty.  This table is mandatory", return -EINVAL);
>  
>  	table_info->max_clock_voltage_on_ac.sclk =
>  		allowed_sclk_vdd_table->entries[allowed_sclk_vdd_table->count - 1].clk;
> @@ -3415,8 +3410,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
>  					DPMTABLE_OD_UPDATE_SCLK)) {
>  			result = vega10_populate_all_graphic_levels(hwmgr);
>  			PP_ASSERT_WITH_CODE(!result,
> -					"Failed to populate SCLK during \
> -					PopulateNewDPMClocksStates Function!",
> +					"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
>  					return result);
>  		}
>  
> @@ -3425,8 +3419,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
>  					DPMTABLE_OD_UPDATE_MCLK)){
>  			result = vega10_populate_all_memory_levels(hwmgr);
>  			PP_ASSERT_WITH_CODE(!result,
> -					"Failed to populate MCLK during \
> -					PopulateNewDPMClocksStates Function!",
> +					"Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
>  					return result);
>  		}
>  	} else {
> @@ -3543,8 +3536,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
>  			data->apply_optimized_settings) {
>  			result = vega10_populate_all_graphic_levels(hwmgr);
>  			PP_ASSERT_WITH_CODE(!result,
> -					"Failed to populate SCLK during \
> -					PopulateNewDPMClocksStates Function!",
> +					"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
>  					return result);
>  		}
>  
> @@ -3552,8 +3544,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
>  				(DPMTABLE_OD_UPDATE_MCLK + DPMTABLE_UPDATE_MCLK)) {
>  			result = vega10_populate_all_memory_levels(hwmgr);
>  			PP_ASSERT_WITH_CODE(!result,
> -					"Failed to populate MCLK during \
> -					PopulateNewDPMClocksStates Function!",
> +					"Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
>  					return result);
>  		}
>  	}
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> index 4d672cd15785..ed4b37e566a3 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> @@ -1732,8 +1732,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>  
>  	if (0 != result) {
>  		smu_data->smc_state_table.GraphicsBootLevel = 0;
> -		pr_err("VBIOS did not find boot engine clock value \
> -			in dependency table. Using Graphics DPM level 0!");
> +		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
>  		result = 0;
>  	}
>  
> @@ -1743,8 +1742,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>  
>  	if (0 != result) {
>  		smu_data->smc_state_table.MemoryBootLevel = 0;
> -		pr_err("VBIOS did not find boot engine clock value \
> -			in dependency table. Using Memory DPM level 0!");
> +		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
>  		result = 0;
>  	}
>  
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> index 34128822b8fb..2ff682d44e8c 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> @@ -911,8 +911,7 @@ static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
>  		hwmgr->dyn_state.vddc_dependency_on_sclk, engine_clock,
>  		&graphic_level->MinVddc);
>  	PP_ASSERT_WITH_CODE((0 == result),
> -		"can not find VDDC voltage value for VDDC	\
> -		engine clock dependency table", return result);
> +		"can not find VDDC voltage value for VDDC engine clock dependency table", return result);
>  
>  	/* SCLK frequency in units of 10KHz*/
>  	graphic_level->SclkFrequency = engine_clock;
> @@ -1678,8 +1677,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>  
>  	if (0 != result) {
>  		smu_data->smc_state_table.GraphicsBootLevel = 0;
> -		pr_err("VBIOS did not find boot engine clock value \
> -			in dependency table. Using Graphics DPM level 0!");
> +		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
>  		result = 0;
>  	}
>  
> @@ -1689,8 +1687,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>  
>  	if (0 != result) {
>  		smu_data->smc_state_table.MemoryBootLevel = 0;
> -		pr_err("VBIOS did not find boot engine clock value \
> -			in dependency table. Using Memory DPM level 0!");
> +		pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
>  		result = 0;
>  	}
>  
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
> index 2f979fb86824..f6f39d01d227 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
> @@ -381,10 +381,8 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr)
>  		(rev_id == 0xc1) ||
>  		(rev_id == 0xc3)))) {
>  		if (smc_driver_if_version != SMU9_DRIVER_IF_VERSION) {
> -			pr_err("Your firmware(0x%x) doesn't match \
> -				SMU9_DRIVER_IF_VERSION(0x%x). \
> -				Please update your firmware!\n",
> -				smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
> +			pr_err("Your firmware(0x%x) doesn't match SMU9_DRIVER_IF_VERSION(0x%x). Please update your firmware!\n",
> +			       smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
>  			return -EINVAL;
>  		}
>  	}
> 

Re: [PATCH 2/4] drm: amd: Fix line continuation formats

[Joe Perches]

On Thu, 2017-11-16 at 10:38 -0500, Harry Wentland wrote:
> On 2017-11-16 10:27 AM, Joe Perches wrote:
> > Line continuations with excess spacing causes unexpected output.
[]
> > @@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
> >  	if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
> >  		ASSERT(0);
> >  		dm_logger_write(link->ctx->logger, LOG_ERROR,
> > -			"%s: Link Training Error, could not \
> > -			 get CR after %d tries. \
> > -			Possibly voltage swing issue", __func__,
> > +			"%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",
> 
> Would probably be good to add a '\n' here as well but that's not the main intention of this patch.

About 1/4 of the dm_logger_write calls are missing
newlines and I think it should be a separate patch.

I encourage you to fix them one day.

> Reviewed-by: Harry Wentland <harry.wentland@amd.com>

cheers, Joe
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/4] drm: amd: Fix line continuation formats

[Joe Perches]

On Thu, 2017-11-16 at 10:38 -0500, Harry Wentland wrote:
> On 2017-11-16 10:27 AM, Joe Perches wrote:
> > Line continuations with excess spacing causes unexpected output.
[]
> > @@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
> >  	if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
> >  		ASSERT(0);
> >  		dm_logger_write(link->ctx->logger, LOG_ERROR,
> > -			"%s: Link Training Error, could not \
> > -			 get CR after %d tries. \
> > -			Possibly voltage swing issue", __func__,
> > +			"%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",
> 
> Would probably be good to add a '\n' here as well but that's not the main intention of this patch.

About 1/4 of the dm_logger_write calls are missing
newlines and I think it should be a separate patch.

I encourage you to fix them one day.

> Reviewed-by: Harry Wentland <harry.wentland@amd.com>

cheers, Joe

Re: [PATCH 2/4] drm: amd: Fix line continuation formats

[Alex Deucher]

On Thu, Nov 16, 2017 at 10:50 AM, Joe Perches <joe@perches.com> wrote:
> On Thu, 2017-11-16 at 10:38 -0500, Harry Wentland wrote:
>> On 2017-11-16 10:27 AM, Joe Perches wrote:
>> > Line continuations with excess spacing causes unexpected output.
> []
>> > @@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
>> >     if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
>> >             ASSERT(0);
>> >             dm_logger_write(link->ctx->logger, LOG_ERROR,
>> > -                   "%s: Link Training Error, could not \
>> > -                    get CR after %d tries. \
>> > -                   Possibly voltage swing issue", __func__,
>> > +                   "%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",
>>
>> Would probably be good to add a '\n' here as well but that's not the main intention of this patch.
>
> About 1/4 of the dm_logger_write calls are missing
> newlines and I think it should be a separate patch.
>
> I encourage you to fix them one day.
>
>> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
>
> cheers, Joe

Applied.  Thanks!

Alex
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/4] drm: amd: Fix line continuation formats

[Alex Deucher]

On Thu, Nov 16, 2017 at 10:50 AM, Joe Perches <joe@perches.com> wrote:
> On Thu, 2017-11-16 at 10:38 -0500, Harry Wentland wrote:
>> On 2017-11-16 10:27 AM, Joe Perches wrote:
>> > Line continuations with excess spacing causes unexpected output.
> []
>> > @@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
>> >     if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
>> >             ASSERT(0);
>> >             dm_logger_write(link->ctx->logger, LOG_ERROR,
>> > -                   "%s: Link Training Error, could not \
>> > -                    get CR after %d tries. \
>> > -                   Possibly voltage swing issue", __func__,
>> > +                   "%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",
>>
>> Would probably be good to add a '\n' here as well but that's not the main intention of this patch.
>
> About 1/4 of the dm_logger_write calls are missing
> newlines and I think it should be a separate patch.
>
> I encourage you to fix them one day.
>
>> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
>
> cheers, Joe

Applied.  Thanks!

Alex

[PATCH 3/4] [media] dibx000_common: Fix line continuation format

[Joe Perches]

Line continuations with excess spacing causes unexpected output.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/media/dvb-frontends/dibx000_common.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/dvb-frontends/dibx000_common.c b/drivers/media/dvb-frontends/dibx000_common.c
index bc28184c7fb0..d981233e458f 100644
--- a/drivers/media/dvb-frontends/dibx000_common.c
+++ b/drivers/media/dvb-frontends/dibx000_common.c
@@ -288,8 +288,8 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap,
 	int ret;
 
 	if (num > 32) {
-		dprintk("%s: too much I2C message to be transmitted (%i).\
-				Maximum is 32", __func__, num);
+		dprintk("%s: too much I2C message to be transmitted (%i). Maximum is 32",
+			__func__, num);
 		return -ENOMEM;
 	}
 
@@ -335,8 +335,8 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap,
 	int ret;
 
 	if (num > 32) {
-		dprintk("%s: too much I2C message to be transmitted (%i).\
-				Maximum is 32", __func__, num);
+		dprintk("%s: too much I2C message to be transmitted (%i). Maximum is 32",
+			__func__, num);
 		return -ENOMEM;
 	}
 
-- 
2.15.0

[PATCH 4/4] ima: Fix line continuation format

[Joe Perches]

Line continuations with excess spacing causes unexpected output.

Signed-off-by: Joe Perches <joe@perches.com>
---
 security/integrity/ima/ima_template.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
index 7412d0291ab9..30db39b23804 100644
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
@@ -377,8 +377,7 @@ int ima_restore_measurement_list(loff_t size, void *buf)
 			break;
 
 		if (hdr[HDR_TEMPLATE_NAME].len >= MAX_TEMPLATE_NAME_LEN) {
-			pr_err("attempting to restore a template name \
-				that is too long\n");
+			pr_err("attempting to restore a template name that is too long\n");
 			ret = -EINVAL;
 			break;
 		}
@@ -389,8 +388,8 @@ int ima_restore_measurement_list(loff_t size, void *buf)
 		template_name[hdr[HDR_TEMPLATE_NAME].len] = 0;
 
 		if (strcmp(template_name, "ima") == 0) {
-			pr_err("attempting to restore an unsupported \
-				template \"%s\" failed\n", template_name);
+			pr_err("attempting to restore an unsupported template \"%s\" failed\n",
+			       template_name);
 			ret = -EINVAL;
 			break;
 		}
@@ -410,8 +409,8 @@ int ima_restore_measurement_list(loff_t size, void *buf)
 						&(template_desc->fields),
 						&(template_desc->num_fields));
 		if (ret < 0) {
-			pr_err("attempting to restore the template fmt \"%s\" \
-				failed\n", template_desc->fmt);
+			pr_err("attempting to restore the template fmt \"%s\" failed\n",
+			       template_desc->fmt);
 			ret = -EINVAL;
 			break;
 		}
-- 
2.15.0

[PATCH 4/4] ima: Fix line continuation format

[Joe Perches]

Line continuations with excess spacing causes unexpected output.

Signed-off-by: Joe Perches <joe@perches.com>
---
 security/integrity/ima/ima_template.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
index 7412d0291ab9..30db39b23804 100644
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
@@ -377,8 +377,7 @@ int ima_restore_measurement_list(loff_t size, void *buf)
 			break;
 
 		if (hdr[HDR_TEMPLATE_NAME].len >= MAX_TEMPLATE_NAME_LEN) {
-			pr_err("attempting to restore a template name \
-				that is too long\n");
+			pr_err("attempting to restore a template name that is too long\n");
 			ret = -EINVAL;
 			break;
 		}
@@ -389,8 +388,8 @@ int ima_restore_measurement_list(loff_t size, void *buf)
 		template_name[hdr[HDR_TEMPLATE_NAME].len] = 0;
 
 		if (strcmp(template_name, "ima") == 0) {
-			pr_err("attempting to restore an unsupported \
-				template \"%s\" failed\n", template_name);
+			pr_err("attempting to restore an unsupported template \"%s\" failed\n",
+			       template_name);
 			ret = -EINVAL;
 			break;
 		}
@@ -410,8 +409,8 @@ int ima_restore_measurement_list(loff_t size, void *buf)
 						&(template_desc->fields),
 						&(template_desc->num_fields));
 		if (ret < 0) {
-			pr_err("attempting to restore the template fmt \"%s\" \
-				failed\n", template_desc->fmt);
+			pr_err("attempting to restore the template fmt \"%s\" failed\n",
+			       template_desc->fmt);
 			ret = -EINVAL;
 			break;
 		}
-- 
2.15.0

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/4] treewide: Fix line continuation formats

[Mimi Zohar]

On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> Avoid using line continations in formats as that causes unexpected
> output.

Is having lines greater than 80 characters the preferred method?
 Could you add quotes before the backlash and before the first word on
the next line instead?

Mimi

[PATCH 0/4] treewide: Fix line continuation formats

[Mimi Zohar]

On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> Avoid using line continations in formats as that causes unexpected
> output.

Is having lines greater than 80 characters the preferred method?
?Could you add quotes before the backlash and before the first word on
the next line instead?

Mimi

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/4] treewide: Fix line continuation formats

[Mimi Zohar]

On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> Avoid using line continations in formats as that causes unexpected
> output.

Is having lines greater than 80 characters the preferred method?
 Could you add quotes before the backlash and before the first word on
the next line instead?

Mimi

Re: [PATCH 0/4] treewide: Fix line continuation formats

[Joe Perches]

On Thu, 2017-11-16 at 12:11 -0500, Mimi Zohar wrote:
> On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> > Avoid using line continations in formats as that causes unexpected
> > output.
> 
> Is having lines greater than 80 characters the preferred method?

yes.

>  Could you add quotes before the backlash and before the first word on
> the next line instead?

coalesced formats are preferred.

[PATCH 0/4] treewide: Fix line continuation formats

[Joe Perches]

On Thu, 2017-11-16 at 12:11 -0500, Mimi Zohar wrote:
> On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> > Avoid using line continations in formats as that causes unexpected
> > output.
> 
> Is having lines greater than 80 characters the preferred method?

yes.

>  Could you add quotes before the backlash and before the first word on
> the next line instead?

coalesced formats are preferred.

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/4] treewide: Fix line continuation formats

[Mimi Zohar]

On Thu, 2017-11-16 at 09:17 -0800, Joe Perches wrote:
> On Thu, 2017-11-16 at 12:11 -0500, Mimi Zohar wrote:
> > On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> > > Avoid using line continations in formats as that causes unexpected
> > > output.
> > 
> > Is having lines greater than 80 characters the preferred method?
> 
> yes.
> 
> >  Could you add quotes before the backlash and before the first word on
> > the next line instead?
> 
> coalesced formats are preferred.

In the future, please reference the commit 6f76b6fcaa60 "CodingStyle:
Document the exception of not splitting user-visible strings, for
grepping"

thanks,

Mimi

[PATCH 0/4] treewide: Fix line continuation formats

[Mimi Zohar]

On Thu, 2017-11-16 at 09:17 -0800, Joe Perches wrote:
> On Thu, 2017-11-16 at 12:11 -0500, Mimi Zohar wrote:
> > On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> > > Avoid using line continations in formats as that causes unexpected
> > > output.
> > 
> > Is having lines greater than 80 characters the preferred method?
> 
> yes.
> 
> >  Could you add quotes before the backlash and before the first word on
> > the next line instead?
> 
> coalesced formats are preferred.

In the future, please reference the commit 6f76b6fcaa60 "CodingStyle:
Document the exception of not splitting user-visible strings, for
grepping"

thanks,

Mimi

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html