[PATCH -next] libata.h: add stub for ata_sas_port_resume

[PATCH -next] libata.h: add stub for ata_sas_port_resume

[Randy Dunlap]

From: Randy Dunlap <rdunlap@infradead.org>

Fix build error when CONFIG_PM is not enabled by adding a stub
function in <linux/libata.h>.

drivers/scsi/libsas/sas_ata.c: In function 'sas_resume_sata':
drivers/scsi/libsas/sas_ata.c:756:3: error: implicit declaration of function 'ata_sas_port_resume' [-Werror=implicit-function-declaration]

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Jim Davis <jim.epost@gmail.com>
---
 include/linux/libata.h |    3 +++
 1 file changed, 3 insertions(+)

--- linux-next-20140319.orig/include/linux/libata.h
+++ linux-next-20140319/include/linux/libata.h
@@ -1148,6 +1148,9 @@ static inline void ata_sas_port_suspend(
 static inline void ata_sas_port_async_resume(struct ata_port *ap)
 {
 }
+static inline void ata_sas_port_resume(struct ata_port *ap)
+{
+}
 #endif
 extern int ata_ratelimit(void);
 extern void ata_msleep(struct ata_port *ap, unsigned int msecs);

Re: [PATCH -next] libata.h: add stub for ata_sas_port_resume

[Tejun Heo]

On Wed, Mar 19, 2014 at 10:46:25AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build error when CONFIG_PM is not enabled by adding a stub
> function in <linux/libata.h>.
> 
> drivers/scsi/libsas/sas_ata.c: In function 'sas_resume_sata':
> drivers/scsi/libsas/sas_ata.c:756:3: error: implicit declaration of function 'ata_sas_port_resume' [-Werror=implicit-function-declaration]
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: Jim Davis <jim.epost@gmail.com>
> ---
>  include/linux/libata.h |    3 +++
>  1 file changed, 3 insertions(+)
> 
> --- linux-next-20140319.orig/include/linux/libata.h
> +++ linux-next-20140319/include/linux/libata.h
> @@ -1148,6 +1148,9 @@ static inline void ata_sas_port_suspend(
>  static inline void ata_sas_port_async_resume(struct ata_port *ap)
>  {
>  }
> +static inline void ata_sas_port_resume(struct ata_port *ap)
> +{
> +}
>  #endif
>  extern int ata_ratelimit(void);
>  extern void ata_msleep(struct ata_port *ap, unsigned int msecs);

Applied to libata/for-3.15.

Thanks.

-- 
tejun

Re: [PATCH -next] libata.h: add stub for ata_sas_port_resume

[Dan Williams]

On Wed, 2014-03-19 at 13:58 -0400, Tejun Heo wrote:
> On Wed, Mar 19, 2014 at 10:46:25AM -0700, Randy Dunlap wrote:
> > From: Randy Dunlap <rdunlap@infradead.org>
> > 
> > Fix build error when CONFIG_PM is not enabled by adding a stub
> > function in <linux/libata.h>.
> > 
> > drivers/scsi/libsas/sas_ata.c: In function 'sas_resume_sata':
> > drivers/scsi/libsas/sas_ata.c:756:3: error: implicit declaration of function 'ata_sas_port_resume' [-Werror=implicit-function-declaration]
> > 
> > Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> > Reported-by: Jim Davis <jim.epost@gmail.com>
> > ---
> >  include/linux/libata.h |    3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > --- linux-next-20140319.orig/include/linux/libata.h
> > +++ linux-next-20140319/include/linux/libata.h
> > @@ -1148,6 +1148,9 @@ static inline void ata_sas_port_suspend(
> >  static inline void ata_sas_port_async_resume(struct ata_port *ap)
> >  {
> >  }
> > +static inline void ata_sas_port_resume(struct ata_port *ap)
> > +{
> > +}
> >  #endif
> >  extern int ata_ratelimit(void);
> >  extern void ata_msleep(struct ata_port *ap, unsigned int msecs);
> 
> Applied to libata/for-3.15.
> 
> Thanks.

Agh, my mistake... one more incremental fixlet:

8<--------------
Subject: libata: remove unused ata_sas_port_async_resume() stub

From: Dan Williams <dan.j.williams@intel.com>

Commit bc6e7c4b0d1a "libata, libsas: kill pm_result and related cleanup"
renamed ata_sas_port_async_resume() to ata_sas_port_resume(), but missed
a CONFIG_PM=n stub conversion.  Randy fixed that up in commit
a5a6569959fc "libata.h: add stub for ata_sas_port_resume", but missed
the deletion of the now unused ata_sas_port_async_resume() routine.

Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 include/linux/libata.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 52723789b991..1de36be64df4 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1145,9 +1145,6 @@ extern void ata_sas_port_resume(struct ata_port *ap);
 static inline void ata_sas_port_suspend(struct ata_port *ap)
 {
 }
-static inline void ata_sas_port_async_resume(struct ata_port *ap)
-{
-}
 static inline void ata_sas_port_resume(struct ata_port *ap)
 {
 }

Re: [PATCH -next] libata.h: add stub for ata_sas_port_resume

[Tejun Heo]

On Wed, Mar 19, 2014 at 11:14:15AM -0700, Dan Williams wrote:
> Subject: libata: remove unused ata_sas_port_async_resume() stub
> 
> From: Dan Williams <dan.j.williams@intel.com>
> 
> Commit bc6e7c4b0d1a "libata, libsas: kill pm_result and related cleanup"
> renamed ata_sas_port_async_resume() to ata_sas_port_resume(), but missed
> a CONFIG_PM=n stub conversion.  Randy fixed that up in commit
> a5a6569959fc "libata.h: add stub for ata_sas_port_resume", but missed
> the deletion of the now unused ata_sas_port_async_resume() routine.
> 
> Cc: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Applied to libata/for-3.15.

Thanks.

-- 
tejun