2015-07-14 20:06:09

by Florian Fainelli

Subject: [PATCH 4.2] ata: ahci_brcmstb: Fix warnings with CONFIG_PM_SLEEP=n

When CONFIG_PM_SLEEP is disabled, brcm_ahci_{suspend,resume} are not
used, which causes such a build warning to occur:

CC drivers/ata/ahci_brcmstb.o
drivers/ata/ahci_brcmstb.c:212:12: warning: 'brcm_ahci_suspend' defined
but not used [-Wunused-function]
static int brcm_ahci_suspend(struct device *dev)
^
drivers/ata/ahci_brcmstb.c:224:12: warning: 'brcm_ahci_resume' defined
but not used [-Wunused-function]
static int brcm_ahci_resume(struct device *dev)
^
LD drivers/ata/built-in.o

Fixes: 766a2d979632 ("ata: add Broadcom AHCI SATA3 driver for STB chips")
Signed-off-by: Florian Fainelli <[email protected]>
---
Tejun, this is a new driver that got merged during 4.2, could you queue
this up for an upcoming 4.2-rcX pull request?

Thanks!

drivers/ata/ahci_brcmstb.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/ata/ahci_brcmstb.c b/drivers/ata/ahci_brcmstb.c
index ce1e3a885981..42b6cf4a05c8 100644
--- a/drivers/ata/ahci_brcmstb.c
+++ b/drivers/ata/ahci_brcmstb.c
@@ -209,6 +209,7 @@ static void brcm_sata_init(struct brcm_ahci_priv *priv)
priv->top_ctrl + SATA_TOP_CTRL_BUS_CTRL);
}

+#ifdef CONFIG_PM_SLEEP
static int brcm_ahci_suspend(struct device *dev)
{
struct ata_host *host = dev_get_drvdata(dev);
@@ -231,6 +232,7 @@ static int brcm_ahci_resume(struct device *dev)
brcm_sata_phys_enable(priv);
return ahci_platform_resume(dev);
}
+#endif

static struct scsi_host_template ahci_platform_sht = {
AHCI_SHT(DRV_NAME),
--
2.1.0

2015-07-14 22:06:39

by Brian Norris

Subject: Re: [PATCH 4.2] ata: ahci_brcmstb: Fix warnings with CONFIG_PM_SLEEP=n

On Tue, Jul 14, 2015 at 01:03:33PM -0700, Florian Fainelli wrote:
> When CONFIG_PM_SLEEP is disabled, brcm_ahci_{suspend,resume} are not
> used, which causes such a build warning to occur:
>
> CC drivers/ata/ahci_brcmstb.o
> drivers/ata/ahci_brcmstb.c:212:12: warning: 'brcm_ahci_suspend' defined
> but not used [-Wunused-function]
> static int brcm_ahci_suspend(struct device *dev)
> ^
> drivers/ata/ahci_brcmstb.c:224:12: warning: 'brcm_ahci_resume' defined
> but not used [-Wunused-function]
> static int brcm_ahci_resume(struct device *dev)
> ^
> LD drivers/ata/built-in.o
>
> Fixes: 766a2d979632 ("ata: add Broadcom AHCI SATA3 driver for STB chips")
> Signed-off-by: Florian Fainelli <[email protected]>
> ---
> Tejun, this is a new driver that got merged during 4.2, could you queue
> this up for an upcoming 4.2-rcX pull request?

Acked-by: Brian Norris <[email protected]>

2015-07-27 19:56:13

by Florian Fainelli

Subject: Re: [PATCH 4.2] ata: ahci_brcmstb: Fix warnings with CONFIG_PM_SLEEP=n

On 14/07/15 15:06, Brian Norris wrote:
> On Tue, Jul 14, 2015 at 01:03:33PM -0700, Florian Fainelli wrote:
>> When CONFIG_PM_SLEEP is disabled, brcm_ahci_{suspend,resume} are not
>> used, which causes such a build warning to occur:
>>
>> CC drivers/ata/ahci_brcmstb.o
>> drivers/ata/ahci_brcmstb.c:212:12: warning: 'brcm_ahci_suspend' defined
>> but not used [-Wunused-function]
>> static int brcm_ahci_suspend(struct device *dev)
>> ^
>> drivers/ata/ahci_brcmstb.c:224:12: warning: 'brcm_ahci_resume' defined
>> but not used [-Wunused-function]
>> static int brcm_ahci_resume(struct device *dev)
>> ^
>> LD drivers/ata/built-in.o
>>
>> Fixes: 766a2d979632 ("ata: add Broadcom AHCI SATA3 driver for STB chips")
>> Signed-off-by: Florian Fainelli <[email protected]>
>> ---
>> Tejun, this is a new driver that got merged during 4.2, could you queue
>> this up for an upcoming 4.2-rcX pull request?
>
> Acked-by: Brian Norris <[email protected]>
>

Tejun, I am not seeing this change queued in your for-4.2-fixes branch
did you need me to do anything?
--
Florian

2015-07-28 18:03:04

by Tejun Heo

Subject: Re: [PATCH 4.2] ata: ahci_brcmstb: Fix warnings with CONFIG_PM_SLEEP=n

On Mon, Jul 27, 2015 at 12:54:07PM -0700, Florian Fainelli wrote:
> On 14/07/15 15:06, Brian Norris wrote:
> > On Tue, Jul 14, 2015 at 01:03:33PM -0700, Florian Fainelli wrote:
> >> When CONFIG_PM_SLEEP is disabled, brcm_ahci_{suspend,resume} are not
> >> used, which causes such a build warning to occur:
> >>
> >> CC drivers/ata/ahci_brcmstb.o
> >> drivers/ata/ahci_brcmstb.c:212:12: warning: 'brcm_ahci_suspend' defined
> >> but not used [-Wunused-function]
> >> static int brcm_ahci_suspend(struct device *dev)
> >> ^
> >> drivers/ata/ahci_brcmstb.c:224:12: warning: 'brcm_ahci_resume' defined
> >> but not used [-Wunused-function]
> >> static int brcm_ahci_resume(struct device *dev)
> >> ^
> >> LD drivers/ata/built-in.o
> >>
> >> Fixes: 766a2d979632 ("ata: add Broadcom AHCI SATA3 driver for STB chips")
> >> Signed-off-by: Florian Fainelli <[email protected]>
> >> ---
> >> Tejun, this is a new driver that got merged during 4.2, could you queue
> >> this up for an upcoming 4.2-rcX pull request?
> >
> > Acked-by: Brian Norris <[email protected]>
> >
>
> Tejun, I am not seeing this change queued in your for-4.2-fixes branch
> did you need me to do anything?

Oops, I missed it, sorry. Applied to libata/for-4.2-fixes.

Thanks.

--
tejun