diff mbox

[2/2] pwm: core: Fix coding style issues

Message ID 1344573730-21907-2-git-send-email-sachin.kamat@linaro.org
State Superseded
Headers show

Commit Message

Sachin Kamat Aug. 10, 2012, 4:42 a.m. UTC
Fixes the following:
WARNING: line over 80 characters
ERROR: spaces required around that ':' (ctx:VxW)
WARNING: Prefer pr_warn(... to pr_warning(...

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/pwm/core.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Comments

Thierry Reding Aug. 10, 2012, 9:55 a.m. UTC | #1
On Fri, Aug 10, 2012 at 10:12:10AM +0530, Sachin Kamat wrote:
> Fixes the following:
> WARNING: line over 80 characters
> ERROR: spaces required around that ':' (ctx:VxW)
> WARNING: Prefer pr_warn(... to pr_warning(...
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/pwm/core.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> index efc20f8..929be13 100644
> --- a/drivers/pwm/core.c
> +++ b/drivers/pwm/core.c
> @@ -130,7 +130,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
>  }
>  
>  static struct pwm_device *of_pwm_simple_xlate(struct pwm_chip *pc,
> -					      const struct of_phandle_args *args)
> +					     const struct of_phandle_args *args)
>  {
>  	struct pwm_device *pwm;
>  

Can this hunk be removed, please? I think aligning the arguments is more
useful than respecting the 80-columns limit.

Thierry
Sachin Kamat Aug. 10, 2012, 9:59 a.m. UTC | #2
On 10 August 2012 15:25, Thierry Reding
<thierry.reding@avionic-design.de> wrote:
> On Fri, Aug 10, 2012 at 10:12:10AM +0530, Sachin Kamat wrote:
>> Fixes the following:
>> WARNING: line over 80 characters
>> ERROR: spaces required around that ':' (ctx:VxW)
>> WARNING: Prefer pr_warn(... to pr_warning(...
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> ---
>>  drivers/pwm/core.c |    6 +++---
>>  1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
>> index efc20f8..929be13 100644
>> --- a/drivers/pwm/core.c
>> +++ b/drivers/pwm/core.c
>> @@ -130,7 +130,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
>>  }
>>
>>  static struct pwm_device *of_pwm_simple_xlate(struct pwm_chip *pc,
>> -                                           const struct of_phandle_args *args)
>> +                                          const struct of_phandle_args *args)
>>  {
>>       struct pwm_device *pwm;
>>
>
> Can this hunk be removed, please? I think aligning the arguments is more
> useful than respecting the 80-columns limit.

Sure, if you think so. Anyway it was just one space deleted. Do you
want me to re-send the patch?

>
> Thierry
Thierry Reding Aug. 10, 2012, 10:02 a.m. UTC | #3
On Fri, Aug 10, 2012 at 03:29:08PM +0530, Sachin Kamat wrote:
> On 10 August 2012 15:25, Thierry Reding
> <thierry.reding@avionic-design.de> wrote:
> > On Fri, Aug 10, 2012 at 10:12:10AM +0530, Sachin Kamat wrote:
> >> Fixes the following:
> >> WARNING: line over 80 characters
> >> ERROR: spaces required around that ':' (ctx:VxW)
> >> WARNING: Prefer pr_warn(... to pr_warning(...
> >>
> >> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> >> ---
> >>  drivers/pwm/core.c |    6 +++---
> >>  1 files changed, 3 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> >> index efc20f8..929be13 100644
> >> --- a/drivers/pwm/core.c
> >> +++ b/drivers/pwm/core.c
> >> @@ -130,7 +130,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
> >>  }
> >>
> >>  static struct pwm_device *of_pwm_simple_xlate(struct pwm_chip *pc,
> >> -                                           const struct of_phandle_args *args)
> >> +                                          const struct of_phandle_args *args)
> >>  {
> >>       struct pwm_device *pwm;
> >>
> >
> > Can this hunk be removed, please? I think aligning the arguments is more
> > useful than respecting the 80-columns limit.
> 
> Sure, if you think so. Anyway it was just one space deleted. Do you
> want me to re-send the patch?

No, with your permission, I'll just leave that hunk out and remove the
"WARNING: line over 80 characters" line from the commit message.

Thierry
Sachin Kamat Aug. 10, 2012, 10:04 a.m. UTC | #4
On 10 August 2012 15:32, Thierry Reding
<thierry.reding@avionic-design.de> wrote:
> On Fri, Aug 10, 2012 at 03:29:08PM +0530, Sachin Kamat wrote:
>> On 10 August 2012 15:25, Thierry Reding
>> <thierry.reding@avionic-design.de> wrote:
>> > On Fri, Aug 10, 2012 at 10:12:10AM +0530, Sachin Kamat wrote:
>> >> Fixes the following:
>> >> WARNING: line over 80 characters
>> >> ERROR: spaces required around that ':' (ctx:VxW)
>> >> WARNING: Prefer pr_warn(... to pr_warning(...
>> >>
>> >> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> >> ---
>> >>  drivers/pwm/core.c |    6 +++---
>> >>  1 files changed, 3 insertions(+), 3 deletions(-)
>> >>
>> >> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
>> >> index efc20f8..929be13 100644
>> >> --- a/drivers/pwm/core.c
>> >> +++ b/drivers/pwm/core.c
>> >> @@ -130,7 +130,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
>> >>  }
>> >>
>> >>  static struct pwm_device *of_pwm_simple_xlate(struct pwm_chip *pc,
>> >> -                                           const struct of_phandle_args *args)
>> >> +                                          const struct of_phandle_args *args)
>> >>  {
>> >>       struct pwm_device *pwm;
>> >>
>> >
>> > Can this hunk be removed, please? I think aligning the arguments is more
>> > useful than respecting the 80-columns limit.
>>
>> Sure, if you think so. Anyway it was just one space deleted. Do you
>> want me to re-send the patch?
>
> No, with your permission, I'll just leave that hunk out and remove the
> "WARNING: line over 80 characters" line from the commit message.

OK. That is fine with me.
Thanks.

>
> Thierry
Joe Perches Aug. 10, 2012, 10:51 a.m. UTC | #5
On Fri, 2012-08-10 at 15:34 +0530, Sachin Kamat wrote:
> On 10 August 2012 15:32, Thierry Reding
> <thierry.reding@avionic-design.de> wrote:
> > On Fri, Aug 10, 2012 at 03:29:08PM +0530, Sachin Kamat wrote:
> >> On 10 August 2012 15:25, Thierry Reding
> >> <thierry.reding@avionic-design.de> wrote:
> >> > On Fri, Aug 10, 2012 at 10:12:10AM +0530, Sachin Kamat wrote:
> >> >> Fixes the following:
> >> >> WARNING: line over 80 characters
> >> >> ERROR: spaces required around that ':' (ctx:VxW)
> >> >> WARNING: Prefer pr_warn(... to pr_warning(...
[]
> >> >> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
[]
> >> >> @@ -130,7 +130,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
> >> >>  }
> >> >>
> >> >>  static struct pwm_device *of_pwm_simple_xlate(struct pwm_chip *pc,
> >> >> -                                           const struct of_phandle_args *args)
> >> >> +                                          const struct of_phandle_args *args)
> >> >>  {

Another way to write this is to put the return type on a
separate line like:

type
func(args to 80,
     more args aligned to open paren...)

for this case:

static struct pwm_device *
of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)
Thierry Reding Aug. 10, 2012, 10:58 a.m. UTC | #6
On Fri, Aug 10, 2012 at 03:51:33AM -0700, Joe Perches wrote:
> On Fri, 2012-08-10 at 15:34 +0530, Sachin Kamat wrote:
> > On 10 August 2012 15:32, Thierry Reding
> > <thierry.reding@avionic-design.de> wrote:
> > > On Fri, Aug 10, 2012 at 03:29:08PM +0530, Sachin Kamat wrote:
> > >> On 10 August 2012 15:25, Thierry Reding
> > >> <thierry.reding@avionic-design.de> wrote:
> > >> > On Fri, Aug 10, 2012 at 10:12:10AM +0530, Sachin Kamat wrote:
> > >> >> Fixes the following:
> > >> >> WARNING: line over 80 characters
> > >> >> ERROR: spaces required around that ':' (ctx:VxW)
> > >> >> WARNING: Prefer pr_warn(... to pr_warning(...
> []
> > >> >> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> []
> > >> >> @@ -130,7 +130,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
> > >> >>  }
> > >> >>
> > >> >>  static struct pwm_device *of_pwm_simple_xlate(struct pwm_chip *pc,
> > >> >> -                                           const struct of_phandle_args *args)
> > >> >> +                                          const struct of_phandle_args *args)
> > >> >>  {
> 
> Another way to write this is to put the return type on a
> separate line like:
> 
> type
> func(args to 80,
>      more args aligned to open paren...)
> 
> for this case:
> 
> static struct pwm_device *
> of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)

I was under the impression that the CodingStyle explicitly said not to
do this, but I've just checked and I couldn't find any mention of the
return type placement.

Sachin: Can you fix the warning as Joe suggested and resend the patch?

Thierry
Sachin Kamat Aug. 10, 2012, 11:02 a.m. UTC | #7
On 10 August 2012 16:28, Thierry Reding
<thierry.reding@avionic-design.de> wrote:
> On Fri, Aug 10, 2012 at 03:51:33AM -0700, Joe Perches wrote:
>> On Fri, 2012-08-10 at 15:34 +0530, Sachin Kamat wrote:
>> > On 10 August 2012 15:32, Thierry Reding
>> > <thierry.reding@avionic-design.de> wrote:
>> > > On Fri, Aug 10, 2012 at 03:29:08PM +0530, Sachin Kamat wrote:
>> > >> On 10 August 2012 15:25, Thierry Reding
>> > >> <thierry.reding@avionic-design.de> wrote:
>> > >> > On Fri, Aug 10, 2012 at 10:12:10AM +0530, Sachin Kamat wrote:
>> > >> >> Fixes the following:
>> > >> >> WARNING: line over 80 characters
>> > >> >> ERROR: spaces required around that ':' (ctx:VxW)
>> > >> >> WARNING: Prefer pr_warn(... to pr_warning(...
>> []
>> > >> >> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
>> []
>> > >> >> @@ -130,7 +130,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
>> > >> >>  }
>> > >> >>
>> > >> >>  static struct pwm_device *of_pwm_simple_xlate(struct pwm_chip *pc,
>> > >> >> -                                           const struct of_phandle_args *args)
>> > >> >> +                                          const struct of_phandle_args *args)
>> > >> >>  {
>>
>> Another way to write this is to put the return type on a
>> separate line like:
>>
>> type
>> func(args to 80,
>>      more args aligned to open paren...)
>>
>> for this case:
>>
>> static struct pwm_device *
>> of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)
>
> I was under the impression that the CodingStyle explicitly said not to
> do this, but I've just checked and I couldn't find any mention of the
> return type placement.
>
> Sachin: Can you fix the warning as Joe suggested and resend the patch?
>
> Thierry

Sure. Thanks for the tip Joe.
diff mbox

Patch

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index efc20f8..929be13 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -130,7 +130,7 @@  static int pwm_device_request(struct pwm_device *pwm, const char *label)
 }
 
 static struct pwm_device *of_pwm_simple_xlate(struct pwm_chip *pc,
-					      const struct of_phandle_args *args)
+					     const struct of_phandle_args *args)
 {
 	struct pwm_device *pwm;
 
@@ -549,7 +549,7 @@  void __init pwm_add_table(struct pwm_lookup *table, size_t num)
 struct pwm_device *pwm_get(struct device *dev, const char *con_id)
 {
 	struct pwm_device *pwm = ERR_PTR(-EPROBE_DEFER);
-	const char *dev_id = dev ? dev_name(dev): NULL;
+	const char *dev_id = dev ? dev_name(dev) : NULL;
 	struct pwm_chip *chip = NULL;
 	unsigned int index = 0;
 	unsigned int best = 0;
@@ -631,7 +631,7 @@  void pwm_put(struct pwm_device *pwm)
 	mutex_lock(&pwm_lock);
 
 	if (!test_and_clear_bit(PWMF_REQUESTED, &pwm->flags)) {
-		pr_warning("PWM device already freed\n");
+		pr_warn("PWM device already freed\n");
 		goto out;
 	}