This fixes the following sparse warnings:
drivers/staging/crystalhd/crystalhd_lnx.c:631:5: warning: symbol 'chd_dec_pci_suspend' was not declared. Should it be static?
drivers/staging/crystalhd/crystalhd_lnx.c:665:5: warning: symbol 'chd_dec_pci_resume' was not declared. Should it be static?
drivers/staging/crystalhd/crystalhd_lnx.c:78:29: warning: symbol 'chd_dec_alloc_iodata' was not declared. Should it be static?
drivers/staging/crystalhd/crystalhd_lnx.c:99:6: warning: symbol 'chd_dec_free_iodata' was not declared. Should it be static?
Signed-off-by: Bojan Prtvar <[email protected]>
---
drivers/staging/crystalhd/crystalhd_lnx.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index c1f6163..590e0b8 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -75,8 +75,8 @@ static int chd_dec_disable_int(struct crystalhd_adp *adp)
return 0;
}
-struct crystalhd_ioctl_data *chd_dec_alloc_iodata(struct crystalhd_adp *adp,
- bool isr)
+static struct crystalhd_ioctl_data *
+chd_dec_alloc_iodata(struct crystalhd_adp *adp, bool isr)
{
unsigned long flags = 0;
struct crystalhd_ioctl_data *temp;
@@ -96,7 +96,7 @@ struct crystalhd_ioctl_data *chd_dec_alloc_iodata(struct crystalhd_adp *adp,
return temp;
}
-void chd_dec_free_iodata(struct crystalhd_adp *adp,
+static void chd_dec_free_iodata(struct crystalhd_adp *adp,
struct crystalhd_ioctl_data *iodata, bool isr)
{
unsigned long flags = 0;
@@ -628,7 +628,7 @@ err:
}
#ifdef CONFIG_PM
-int chd_dec_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+static int chd_dec_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct crystalhd_adp *adp;
struct crystalhd_ioctl_data *temp;
@@ -662,7 +662,7 @@ int chd_dec_pci_suspend(struct pci_dev *pdev, pm_message_t state)
return 0;
}
-int chd_dec_pci_resume(struct pci_dev *pdev)
+static int chd_dec_pci_resume(struct pci_dev *pdev)
{
struct crystalhd_adp *adp;
enum BC_STATUS sts = BC_STS_SUCCESS;
--
1.7.9.5
On Fri, Apr 18, 2014 at 07:57:51PM +0200, Bojan Prtvar wrote:
> This fixes the following sparse warnings:
> drivers/staging/crystalhd/crystalhd_lnx.c:631:5: warning: symbol 'chd_dec_pci_suspend' was not declared. Should it be static?
> drivers/staging/crystalhd/crystalhd_lnx.c:665:5: warning: symbol 'chd_dec_pci_resume' was not declared. Should it be static?
> drivers/staging/crystalhd/crystalhd_lnx.c:78:29: warning: symbol 'chd_dec_alloc_iodata' was not declared. Should it be static?
> drivers/staging/crystalhd/crystalhd_lnx.c:99:6: warning: symbol 'chd_dec_free_iodata' was not declared. Should it be static?
>
> Signed-off-by: Bojan Prtvar <[email protected]>
> ---
> drivers/staging/crystalhd/crystalhd_lnx.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
This patch doesn't apply to my tree, can you redo it and resend?
thanks,
greg k-h
On Sat, Apr 19, 2014 at 1:23 AM, Greg KH <[email protected]> wrote:
> On Fri, Apr 18, 2014 at 07:57:51PM +0200, Bojan Prtvar wrote:
>> This fixes the following sparse warnings:
>> drivers/staging/crystalhd/crystalhd_lnx.c:631:5: warning: symbol 'chd_dec_pci_suspend' was not declared. Should it be static?
>> drivers/staging/crystalhd/crystalhd_lnx.c:665:5: warning: symbol 'chd_dec_pci_resume' was not declared. Should it be static?
>> drivers/staging/crystalhd/crystalhd_lnx.c:78:29: warning: symbol 'chd_dec_alloc_iodata' was not declared. Should it be static?
>> drivers/staging/crystalhd/crystalhd_lnx.c:99:6: warning: symbol 'chd_dec_free_iodata' was not declared. Should it be static?
>>
>> Signed-off-by: Bojan Prtvar <[email protected]>
>> ---
>> drivers/staging/crystalhd/crystalhd_lnx.c | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> This patch doesn't apply to my tree, can you redo it and resend?
>
> thanks,
>
> greg k-h
I cloned your tree
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
and on master branch I see work is already done in
commit 038d3f882926bf49562e5f119957fd81015a9390
Author: Valentina Manea <[email protected]>
Date: Mon Oct 7 23:12:14 2013 +0300
Now what confuses me is the date of this patch. Why I didn't see it
linux-next and even in vanilla?
I know this question goes under 'basic workflow section'.
Regards,
Bojan
On Sat, Apr 19, 2014 at 9:58 AM, bojan prtvar <[email protected]> wrote:
> On Sat, Apr 19, 2014 at 1:23 AM, Greg KH <[email protected]> wrote:
>> On Fri, Apr 18, 2014 at 07:57:51PM +0200, Bojan Prtvar wrote:
>>> This fixes the following sparse warnings:
>>> drivers/staging/crystalhd/crystalhd_lnx.c:631:5: warning: symbol 'chd_dec_pci_suspend' was not declared. Should it be static?
>>> drivers/staging/crystalhd/crystalhd_lnx.c:665:5: warning: symbol 'chd_dec_pci_resume' was not declared. Should it be static?
>>> drivers/staging/crystalhd/crystalhd_lnx.c:78:29: warning: symbol 'chd_dec_alloc_iodata' was not declared. Should it be static?
>>> drivers/staging/crystalhd/crystalhd_lnx.c:99:6: warning: symbol 'chd_dec_free_iodata' was not declared. Should it be static?
>>>
>>> Signed-off-by: Bojan Prtvar <[email protected]>
>>> ---
>>> drivers/staging/crystalhd/crystalhd_lnx.c | 10 +++++-----
>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> This patch doesn't apply to my tree, can you redo it and resend?
>>
>> thanks,
>>
>> greg k-h
>
> I cloned your tree
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> and on master branch I see work is already done in
>
> commit 038d3f882926bf49562e5f119957fd81015a9390
> Author: Valentina Manea <[email protected]>
> Date: Mon Oct 7 23:12:14 2013 +0300
>
> Now what confuses me is the date of this patch. Why I didn't see it
> linux-next and even in vanilla?
> I know this question goes under 'basic workflow section'.
>
> Regards,
> Bojan
I re-checked. Everything is OK with 038d3f8829. I made a mess in my
local branches.
Drop this one. And sorry for the noise.