public inbox for devicetree@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	linux-kernel@vger.kernel.org,
	bcm-kernel-feedback-list@broadcom.com,
	devicetree@vger.kernel.org, linux-pwm@vger.kernel.org,
	ariel@vanguardiasur.com.ar
Subject: [PATCH] pwm: fix Broadcom BCM7038 PWM driver
Date: Tue, 06 Oct 2015 21:59:25 +0200	[thread overview]
Message-ID: <6796852.Ynn1zMqb4r@wuerfel> (raw)
In-Reply-To: <20151005151415.GE27759@ulmo>

The newly added pwm-brcmstb driver fails to build if CONFIG_PM_SLEEP
is enabled:

drivers/pwm/pwm-brcmstb.c: In function 'brcmstb_pwm_suspend':
drivers/pwm/pwm-brcmstb.c:309:42: error: 'dev' undeclared (first use in this function)
  struct brcmstb_pwm *p = dev_get_drvdata(dev);

This changes the name of the function argument to match its user.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
On Monday 05 October 2015 17:14:15 Thierry Reding wrote:
> On Mon, Sep 14, 2015 at 04:47:04PM -0700, Florian Fainelli wrote:
> > Florian Fainelli (2):
> >   Documentation: dt: add Broadcom BCM7038 PWM controller binding
> >   pwm: Add Broadcom BCM7038 PWM controller support
> 
> I've applied both of these patches with a couple of stylistic changes.

As in the pwm-berlin driver, one of the fixups was broken.

diff --git a/drivers/pwm/pwm-brcmstb.c b/drivers/pwm/pwm-brcmstb.c
index 083e3ef5b8e5..423ce087cd9c 100644
--- a/drivers/pwm/pwm-brcmstb.c
+++ b/drivers/pwm/pwm-brcmstb.c
@@ -304,7 +304,7 @@ static int brcmstb_pwm_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
-static int brcmstb_pwm_suspend(struct device *d)
+static int brcmstb_pwm_suspend(struct device *dev)
 {
 	struct brcmstb_pwm *p = dev_get_drvdata(dev);
 
@@ -313,7 +313,7 @@ static int brcmstb_pwm_suspend(struct device *d)
 	return 0;
 }
 
-static int brcmstb_pwm_resume(struct device *d)
+static int brcmstb_pwm_resume(struct device *dev)
 {
 	struct brcmstb_pwm *p = dev_get_drvdata(dev);
 

  parent reply	other threads:[~2015-10-06 19:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-14 23:47 [PATCH v4 0/2] pwm: Broadcom BCM7038 PWM controller (v4) Florian Fainelli
2015-09-14 23:47 ` [PATCH v4 1/2] Documentation: dt: add Broadcom BCM7038 PWM controller binding Florian Fainelli
     [not found] ` <1442274426-3507-1-git-send-email-f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-09-14 23:47   ` [PATCH v4 2/2] pwm: Add Broadcom BCM7038 PWM controller support Florian Fainelli
2015-10-05 15:14   ` [PATCH v4 0/2] pwm: Broadcom BCM7038 PWM controller (v4) Thierry Reding
2015-10-06 18:14     ` Florian Fainelli
2015-10-06 18:16       ` Florian Fainelli
2015-10-06 19:59     ` Arnd Bergmann [this message]
2015-10-07  0:51       ` [PATCH] pwm: fix Broadcom BCM7038 PWM driver Florian Fainelli
2015-10-07 13:31         ` Arnd Bergmann
2015-09-25 23:05 ` [PATCH v4 0/2] pwm: Broadcom BCM7038 PWM controller (v4) Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6796852.Ynn1zMqb4r@wuerfel \
    --to=arnd@arndb.de \
    --cc=ariel@vanguardiasur.com.ar \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox