Skip to contentSkip to conversation

libata.h: add stub for ata_sas_port_resume

PATCH Applied Randy Dunlap 3 participants 4 messages Mar 19, 2014

Subsystems (2)
SCSI libata
lore
Share & tools
lore

Randy Dunlap

author
#0 lore raw

PATCH 1/1 libata.h: add stub for ata_sas_port_resume

From: Randy Dunlap <[email protected]>

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 <[email protected]>
Reported-by Jim Davis <[email protected]>
---
 include/linux/libata.h |    3 +++
 1 file changed, 3 insertions(+)
include/linux/libata.h +3 -0
@@ -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
#1 lore raw
Quoted 17 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

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 <[email protected]>
Reported-by Jim Davis <[email protected]>
---
 include/linux/libata.h |    3 +++
 1 file changed, 3 insertions(+)

include/linux/libata.h static inline void ata_sas_port_suspend( · line 1156

Quoted 9 lines
include/linux/libata.h +3 -0
@@ -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.

Signature · 1 line
tejun
#2 lore raw
Quoted 30 lines · Tejun Heo
Quoted 17 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

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 <[email protected]>
Reported-by Jim Davis <[email protected]>
---
 include/linux/libata.h |    3 +++
 1 file changed, 3 insertions(+)

include/linux/libata.h static inline void ata_sas_port_suspend( · line 1156

Quoted 9 lines
include/linux/libata.h +3 -0
@@ -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.

Quoted 1 line

Thanks.

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

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

From: Dan Williams <[email protected]>

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 <[email protected]>
Signed-off-by Dan Williams <[email protected]>
---
 include/linux/libata.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
include/linux/libata.h +0 -3
index 52723789b991..1de36be64df4 100644
@@ -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)
 {
 }
Applied
#3 lore raw
Quoted 4 lines · Dan Williams

Subject: libata: remove unused ata_sas_port_async_resume() stub

From: Dan Williams <[email protected]>

Quoted 8 lines

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 <[email protected]>
Signed-off-by Dan Williams <[email protected]>

Applied to libata/for-3.15.

Thanks.

Signature · 1 line
tejun