From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753711AbbJFT7j (ORCPT ); Tue, 6 Oct 2015 15:59:39 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:51952 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbbJFT7g (ORCPT ); Tue, 6 Oct 2015 15:59:36 -0400 From: Arnd Bergmann To: Thierry Reding Cc: Florian Fainelli , 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 Message-ID: <6796852.Ynn1zMqb4r@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151005151415.GE27759@ulmo> References: <1442274426-3507-1-git-send-email-f.fainelli@gmail.com> <20151005151415.GE27759@ulmo> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:pPqSGoH3Vi8Q0zbr4+KhJPc3AKjQuDdL+kFjIfDIDqH7TSbC7w4 NXUYDoEXvFxUn3yzE812TU1KnfOIH+EVZ2W8gz+J0NoW3CVY9HJAQ3a3CaH/mkC1YOhLM+k e9lskMKvqWZkdc1JJsWzQqkjR/p3eHer1wub68eFtMKaXC1zTbCuCAPTMtxEDaDOGH+mQND iSQi6TLHKN1MmQZE7754A== X-UI-Out-Filterresults: notjunk:1;V01:K0:pYwE6WYOcRE=:j5T/T9pu8zi4sJ9jfZRs/Z jVqTWwZfXUO3QjZ8NIrhXCfL4gI5LfEmCyxY316I1KZ9+tgzC4UP/GoyB7O7DyddT7vy0fPw8 c0lCHuBtZkejBdkv0puC65BqaxlzsE+HCFZw1O1MIWjNjHzDBiKOHJtw8fUdwTC6mGg3vLO2X zm0+E/VnU63XAY6RqmuEwWBYdAA1zUBhf5YXGHOz7JmZI/BNgw6ixjWTL6BWaneRIodIal+qo 4YZViRMdhuWN8oKvJ+X/ABt6X9GaZdSyOwe6Lbx70ucKSeeC/69TksJ27MGMm2E/pYe1DTJhM RrF/C0iYPaIXcAgVkrHm7t416GdZHZXhiXs5MW/S/nPAgd8e9FWm4AYmsbM+67HPMAVWe3vMO ZSqPw/moIZvbA/t1rg8TLRiiFHc76nIk1A7P/kBUiCuxKlhUEoe4KsU+N/OzN5NJq/y667KWr 4TUmoRMGSpQj5LmTDyVKF+jp0vynWyyh71WyyOUmKYe66CWdtQYCJjd2xdupbxfUAO5ELY9q1 o/mBVk9ooqqvy2SdRN9IBVyDK9iZojX7Wd4GYgAb8B2I9uvrevivOg/FxIS2oEWIC6+I3tz43 q7kdgkSUOsIR9MEdhdKBDzY2TtTN+0GxyOOUA4PGxs1jms7ZIZW9Fdm9M+QDbHLfktXIm7302 cezJ2LyZ1SMMBzSi5wNu0tkMlfUADaOaKwhWN0lcZq94pzyOm/wn2nHESMhfduW6PIf3ELqqW NFeCv4J4jj2xzfNF Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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);