kbuild: Assorted small cleanups

o Standardize building math-emu.o for arch/alpha
o Remove old boilerplate code / redundant comments
o Remove unnecessary obj-m := $(sort $(obj-m)) in ALSA

15 files changed, 5 insertions, 70 deletions

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index b4ee7f1b5be4..77634643ce45 100644
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -96,7 +96,7 @@ SUBDIRS := $(SUBDIRS) arch/alpha/kernel arch/alpha/mm arch/alpha/lib \
 CORE_FILES := arch/alpha/kernel/kernel.o arch/alpha/mm/mm.o $(CORE_FILES)
 
 ifeq ($(CONFIG_MATHEMU),y)
-  CORE_FILES := $(CORE_FILES) arch/alpha/math-emu/math-emu.o
+  CORE_FILES := $(CORE_FILES) arch/alpha/math-emu/built-in.o
 endif
 
 LIBS := $(TOPDIR)/arch/alpha/lib/lib.a $(LIBS) $(TOPDIR)/arch/alpha/lib/lib.a
diff --git a/arch/alpha/math-emu/Makefile b/arch/alpha/math-emu/Makefile
index 3f451cbbf946..c05f1e2508b5 100644
--- a/arch/alpha/math-emu/Makefile
+++ b/arch/alpha/math-emu/Makefile
@@ -2,18 +2,12 @@
 # Makefile for the FPU instruction emulation.
 #
 
-CFLAGS += -I. -I$(TOPDIR)/include/math-emu -w
-
-ifeq ($(CONFIG_MATHEMU),y)
+O_TARGET := built-in.o
 
-O_TARGET	:= math-emu.o
-obj-y		:= math.o qrnnd.o
-
-else
+obj-$(CONFIG_MATHEMU) += math-emu.o
 
 math-emu-objs	:= math.o qrnnd.o
-obj-m		:= math-emu.o
 
-endif
+CFLAGS += -I. -I$(TOPDIR)/include/math-emu -w
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 03ce8e58b178..3157d399ceb9 100644
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -9,15 +9,9 @@
 
 all: kernel.o init_task.o pdc_cons.o process.o head.o
 O_TARGET = kernel.o
-O_OBJS = 
 
 # Object file lists.
 
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
 obj-y		+= cache.o setup.o traps.o time.o irq.o \
 		syscall.o entry.o sys_parisc.o pdc.o ptrace.o hardware.o \
 		inventory.o drivers.o semaphore.o pa7300lc.o pci-dma.o \
@@ -38,15 +32,6 @@ obj-$(CONFIG_IOMMU_SBA) += sba_iommu.o
 # obj-$(CONFIG_IOMMU_CCIO) += ccio-rm-dma.o
 obj-$(CONFIG_IOMMU_CCIO) += ccio-dma.o
 
-.o.S:	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $*.S -o $*.o
-
-# Translate to Rules.make lists.
-
-O_OBJS          := $(filter-out $(export-objs), $(obj-y))
-OX_OBJS         := $(filter     $(export-objs), $(obj-y))
-M_OBJS          := $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS         := $(sort $(filter     $(export-objs), $(obj-m)))
-MI_OBJS		:= $(sort $(filter-out $(export-objs), $(int-m)))
-MIX_OBJS	:= $(sort $(filter     $(export-objs), $(int-m)))
+EXTRA_AFLAGS := -traditional
 
 include $(TOPDIR)/Rules.make
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 0bd016e69241..3c7a55188f51 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -688,7 +688,6 @@ u8 ide_dump_status(struct ata_device *drive, struct request * rq, const char *ms
 {
 	unsigned long flags;
 	byte err = 0;
-	int i;
 
 	__save_flags (flags);	/* local CPU only */
 	ide__sti();		/* local CPU only */
diff --git a/drivers/tc/Makefile b/drivers/tc/Makefile
index 40c43ad727e7..7d423218c268 100644
--- a/drivers/tc/Makefile
+++ b/drivers/tc/Makefile
@@ -1,11 +1,6 @@
 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
 
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
@@ -14,28 +9,10 @@ export-objs	:= tc.o
 
 # Object file lists.
 
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
 obj-$(CONFIG_TC) += tc.o
 obj-$(CONFIG_ZS) += zs.o
 obj-$(CONFIG_VT) += lk201.o lk201-map.o lk201-remap.o
 
-# Files that are both resident and modular: remove from modular.
-
-obj-m		:= $(filter-out $(obj-y), $(obj-m))
-
-# Translate to Rules.make lists.
-
-L_TARGET	:= tc.a
-
-L_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-y)))
-LX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-y)))
-M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
-
 include $(TOPDIR)/Rules.make
 
 lk201-map.c: lk201-map.map
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 56947239244a..21d7ee6c913f 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -112,6 +112,4 @@ ifeq ($(CONFIG_SND_SB16_CSP),y)
   obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o
 endif
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/core/seq/Makefile b/sound/core/seq/Makefile
index 22ff33673189..feafb4a3eb6b 100644
--- a/sound/core/seq/Makefile
+++ b/sound/core/seq/Makefile
@@ -81,6 +81,4 @@ obj-$(CONFIG_SND_EMU10K1) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-m
 obj-$(CONFIG_SND_TRIDENT) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
 obj-$(CONFIG_SND_YMFPCI) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/core/seq/instr/Makefile b/sound/core/seq/instr/Makefile
index 139f38e4c263..6228a506d190 100644
--- a/sound/core/seq/instr/Makefile
+++ b/sound/core/seq/instr/Makefile
@@ -43,6 +43,4 @@ obj-$(CONFIG_SND_SONICVIBES) += snd-ainstr-fm.o
 obj-$(CONFIG_SND_TRIDENT) += snd-ainstr-simple.o
 obj-$(CONFIG_SND_YMFPCI) += snd-ainstr-fm.o
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/drivers/mpu401/Makefile b/sound/drivers/mpu401/Makefile
index a67579b427cf..b989d7496d26 100644
--- a/sound/drivers/mpu401/Makefile
+++ b/sound/drivers/mpu401/Makefile
@@ -42,6 +42,4 @@ obj-$(CONFIG_SND_ALI5451) += snd-mpu401-uart.o
 obj-$(CONFIG_SND_TRIDENT) += snd-mpu401-uart.o
 obj-$(CONFIG_SND_YMFPCI) += snd-mpu401-uart.o
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/drivers/opl3/Makefile b/sound/drivers/opl3/Makefile
index 5f17d168fb66..b5df27f62067 100644
--- a/sound/drivers/opl3/Makefile
+++ b/sound/drivers/opl3/Makefile
@@ -65,6 +65,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
   obj-$(CONFIG_SND_YMFPCI) += snd-opl3-synth.o
 endif
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/isa/ad1848/Makefile b/sound/isa/ad1848/Makefile
index 35e7fdec1eae..adaf120bd7ba 100644
--- a/sound/isa/ad1848/Makefile
+++ b/sound/isa/ad1848/Makefile
@@ -16,6 +16,4 @@ obj-$(CONFIG_SND_SGALAXY) += snd-ad1848-lib.o
 obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o
 obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile
index 6dc0e9dbb021..1854680d04dd 100644
--- a/sound/isa/cs423x/Makefile
+++ b/sound/isa/cs423x/Makefile
@@ -25,6 +25,4 @@ obj-$(CONFIG_SND_INTERWAVE_STB) += snd-cs4231-lib.o
 obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-cs4231-lib.o
 obj-$(CONFIG_SND_WAVEFRONT) += snd-cs4231-lib.o
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/isa/gus/Makefile b/sound/isa/gus/Makefile
index d5e157a4b377..c76959f7407f 100644
--- a/sound/isa/gus/Makefile
+++ b/sound/isa/gus/Makefile
@@ -35,6 +35,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
   obj-$(CONFIG_SND_INTERWAVE_STB) += snd-gus-synth.o
 endif
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile
index f2984118985c..ea8fd19b612b 100644
--- a/sound/isa/sb/Makefile
+++ b/sound/isa/sb/Makefile
@@ -34,6 +34,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
   obj-$(CONFIG_SND_SBAWE) += snd-emu8000-synth.o
 endif
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make
diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile
index 4277c0f13a7f..869dbf17d057 100644
--- a/sound/pci/ac97/Makefile
+++ b/sound/pci/ac97/Makefile
@@ -28,6 +28,4 @@ obj-$(CONFIG_SND_NM256) += snd-ac97-codec.o
 obj-$(CONFIG_SND_TRIDENT) += snd-ac97-codec.o
 obj-$(CONFIG_SND_YMFPCI) += snd-ac97-codec.o
 
-obj-m := $(sort $(obj-m))
-
 include $(TOPDIR)/Rules.make