[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAK8P3a2xkh19gocctXf4gv1Km_SaYJPbSC5QkkZ0WMQQAXp83Q@mail.gmail.com>
Date: Thu, 2 Nov 2017 16:40:57 +0100
From: Arnd Bergmann <arnd@...db.de>
To: Kalle Valo <kvalo@....qualcomm.com>
Cc: Ryan Hsu <ryanhsu@....qualcomm.com>,
Govind Singh <govinds@....qualcomm.com>,
Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
Ashok Raj Nagarajan <arnagara@....qualcomm.com>,
Ben Greear <greearb@...delatech.com>,
Brian Norris <briannorris@...omium.org>,
Colin Ian King <colin.king@...onical.com>,
"ath10k@...ts.infradead.org" <ath10k@...ts.infradead.org>,
"linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] ath10k: move pci suspend/resume functions
On Thu, Nov 2, 2017 at 4:23 PM, Kalle Valo <kvalo@....qualcomm.com> wrote:
> Arnd Bergmann <arnd@...db.de> writes:
>
>> The combination of two patches has led to a build failure:
>>
>> drivers/net/wireless/ath/ath10k/pci.c: In function 'ath10k_pci_pm_suspend':
>> drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit declaration of function 'ath10k_pci_suspend'; did you mean 'ath10k_pci_pm_suspend'? [-Werror=implicit-function-declaration]
>> drivers/net/wireless/ath/ath10k/pci.c: In function 'ath10k_pci_pm_resume':
>> drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit declaration of function 'ath10k_pci_resume'; did you mean 'ath10k_pci_pm_resume'? [-Werror=implicit-function-declaration]
>>
>> This moves the functions outside of the now incorrect #ifdef.
>>
>> Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but disabled")
>> Fixes: 6af1de2e4ec4 ("ath10k: mark PM functions as __maybe_unused")
>> Signed-off-by: Arnd Bergmann <arnd@...db.de>
>
> Brian has already fixed this, please check that:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=ath-next&id=20665a9076d48e9abd9a2db13d307f58f7ef6647
>
> But apparently I forgot to merge ath-next to wireless-drivers-next, will
> do that soon.
Yes, Brian's version is better. I considered the same, but wasn't sure
it was safe.
Arnd
Powered by blists - more mailing lists