Skip to contentSkip to conversation

Build mptspi.c on architectures where CONFIG_PM is unset

PATCH In review Tom 'spot' Callaway 2 participants 2 messages Jun 3, 2006 – Jun 10, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Build mptspi.c on architectures where CONFIG_PM is unset

When trying to build mpt* for sparc64 (my T2000 needs mptsas and friends), I noticed that mptspi.o was not building:

CC [M] drivers/message/fusion/mptspi.o
drivers/message/fusion/mptspi.c: In function `mptspi_resume':
drivers/message/fusion/mptspi.c:844: error: implicit declaration of function `mptscsih_resume' drivers/message/fusion/mptspi.c: At top level:
drivers/message/fusion/mptspi.c:839: warning: 'mptspi_resume' defined but not used
make[3]: *** [drivers/message/fusion/mptspi.o] Error 1 make[2]: *** [drivers/message/fusion] Error 2
make[1]: *** [drivers/message] Error 2

sparc64 does not have CONFIG_PM defined, and mptscsih_resume is wrapped in an #ifdef CONFIG_PM in mptscsih.h. mptscsih_resume is only used in the mptspi_resume function in mptspi.c, and its only call is in the pci_driver struct (and that call is also #ifdef CONFIG_PM). In order to get the code to compile, I just needed to wrap the actual function in #ifdef CONFIG_PM, which is what this patch does. I can confirm that it gets the module building again without errors.

drivers/message/fusion/mptspi.c renamed from drivers/message/fusion/mptspi.c.BAD +2 -0
@@ -831,6 +831,7 @@
 	return rc;
 }
 
+#ifdef CONFIG_PM
 /*
  * spi module resume handler
  */
@@ -846,6 +847,7 @@
 
 	return rc;
 }
+#endif
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

~spot

Signature · 4 lines
Tom "spot" Callaway: Red Hat Senior Sales Engineer || GPG ID: 93054260
Fedora Extras Steering Committee Member (RPM Standards and Practices)
Aurora Linux Project Leader: http://auroralinux.org
Lemurs, llamas, and sparcs, oh my!
#1 lore raw

From: "Tom 'spot' Callaway" <[email protected]>
Date: Sat, 03 Jun 2006 09:36:47 -0500

Quoted 9 lines

sparc64 does not have CONFIG_PM defined, and mptscsih_resume is wrapped in an #ifdef CONFIG_PM in mptscsih.h. mptscsih_resume is only used in the mptspi_resume function in mptspi.c, and its only call is in the pci_driver struct (and that call is also #ifdef CONFIG_PM). In order to get the code to compile, I just needed to wrap the actual function in #ifdef CONFIG_PM, which is what this patch does. I can confirm that it gets the module building again without errors.

Thanks Tom I'll apply this.