svn commit: r233354 - in head/sys: conf modules/mps

[Dimitry Andric]

Author: dim
Date: Fri Mar 23 11:35:01 2012
New Revision: 233354
URL: http://svn.freebsd.org/changeset/base/233354

Log:
  Work around the following clang warning in mps(4):
  
    sys/dev/mps/mps_sas.c:861:1: error: function 'mpssas_discovery_timeout' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
    mpssas_discovery_timeout(void *data)
    ^
  
  Because the driver is obtained from upstream, we don't want to modify
  it; just silence the warning instead, it is harmless.
  
  MFC after:	3 days

Modified:
  head/sys/conf/files
  head/sys/conf/kern.mk
  head/sys/modules/mps/Makefile

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri Mar 23 11:26:54 2012	(r233353)
+++ head/sys/conf/files	Fri Mar 23 11:35:01 2012	(r233354)
@@ -1480,7 +1480,8 @@ dev/mps/mps.c			optional mps
 dev/mps/mps_config.c		optional mps
 dev/mps/mps_mapping.c		optional mps
 dev/mps/mps_pci.c		optional mps pci
-dev/mps/mps_sas.c		optional mps
+dev/mps/mps_sas.c		optional mps \
+	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
 dev/mps/mps_sas_lsi.c		optional mps
 dev/mps/mps_table.c		optional mps
 dev/mps/mps_user.c		optional mps

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Fri Mar 23 11:26:54 2012	(r233353)
+++ head/sys/conf/kern.mk	Fri Mar 23 11:35:01 2012	(r233354)
@@ -23,6 +23,7 @@ NO_WSHIFT_COUNT_OVERFLOW=	-Wno-shift-cou
 NO_WUNUSED_VALUE=		-Wno-unused-value
 NO_WSELF_ASSIGN=		-Wno-self-assign
 NO_WFORMAT_SECURITY=		-Wno-format-security
+NO_WUNNEEDED_INTERNAL_DECL=	-Wno-unneeded-internal-declaration
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is
 # some incentive to fix them eventually.

Modified: head/sys/modules/mps/Makefile
==============================================================================
--- head/sys/modules/mps/Makefile	Fri Mar 23 11:26:54 2012	(r233353)
+++ head/sys/modules/mps/Makefile	Fri Mar 23 11:35:01 2012	(r233354)
@@ -11,3 +11,6 @@ SRCS+=	device_if.h bus_if.h pci_if.h
 #CFLAGS += -DMPS_DEBUG
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.mps_sas.c=	${NO_WUNNEEDED_INTERNAL_DECL}
+CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}