[PATCH:xf86-video-mach64 2/2] Remove unused atiaudio.c & ATIAudioNames declaration

Alan Coopersmith alan.coopersmith at oracle.com
Wed Dec 19 22:43:35 PST 2012


Defined a string array, which is not used anywhere.

atiaudio.h remains for now, though for the enum it defines, only one
reference to it remains, initializing the Audio to ATI_AUDIO_NONE, so
it may be a candidate for further cleanup in the future.

Reported by Solaris linker -z guidance option:
ld: guidance: removal of unused file recommended: atiaudio.o

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/Makefile.am |    2 +-
 src/atiaudio.c  |   50 --------------------------------------------------
 src/atiaudio.h  |    2 --
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 src/atiaudio.c

diff --git a/src/Makefile.am b/src/Makefile.am
index f1a255f..2faa69d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ mach64_drv_la_LDFLAGS = -module -avoid-version
 mach64_drv_ladir = @moduledir@/drivers
 mach64_drv_la_SOURCES = \
 	atibus.c atichip.c atiprobe.c atividmem.c \
-	atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \
+	atiadjust.c aticlock.c aticonfig.c aticonsole.c \
 	atidac.c atidsp.c atii2c.c \
 	atilock.c atimach64.c atimach64accel.c atimach64cursor.c \
 	atimach64i2c.c atimach64io.c atimach64xv.c atimode.c atipreinit.c \
diff --git a/src/atiaudio.c b/src/atiaudio.c
deleted file mode 100644
index 555a4a7..0000000
--- a/src/atiaudio.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi at xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atiaudio.h"
-
-/*
- * Audio chip definitions.
- */
-const char *ATIAudioNames[] =
-{
-    "Philips TEA5582",
-    "Mono with audio mux",
-    "Philips TDA9850",
-    "Sony CXA2020S",
-    "ITT MSP3410D",
-    "Crystal CS4236B",
-    "Philips TDA9851",
-    "ITT MSP3415",
-    "ITT MSP3430",
-    "Unknown type (9)",
-    "Unknown type (10)",
-    "Unknown type (11)",
-    "Unknown type (12)",
-    "Unknown type (13)",
-    "Unknown type (14)",
-    "No audio"
-};
diff --git a/src/atiaudio.h b/src/atiaudio.h
index bcea8b4..aa158ad 100644
--- a/src/atiaudio.h
+++ b/src/atiaudio.h
@@ -46,6 +46,4 @@ typedef enum
     ATI_AUDIO_NONE
 } ATIAudioType;
 
-extern const char *ATIAudioNames[];
-
 #endif /* ___ATIAUDIO_H___ */
-- 
1.7.9.2



More information about the xorg-devel mailing list