Skip to contentSkip to conversation

Cleanup LINUX_VERSION_CODE in sound/mipx/au1x00.c

PATCH New Eric Sesterhenn / snakebyte 1 participant 2 messages Dec 19, 2005

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

PATCH 1/1 Cleanup LINUX_VERSION_CODE in sound/mipx/au1x00.c

hi,

this patch removes LINUX_VERSION_CODE usage in
the Au1000 driver.

sound/mips/au1x00.c renamed from sound/mips/au1x00.c.orig +0 -18
@@ -50,12 +50,7 @@
 MODULE_AUTHOR("Charles Eidsness <[email protected]>");
 MODULE_DESCRIPTION("Au1000 AC'97 ALSA Driver");
 MODULE_LICENSE("GPL");
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 MODULE_SUPPORTED_DEVICE("{{AMD,Au1000 AC'97}}");
-#else
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{AMD,Au1000 AC'97}}");
-#endif
 
 #define PLAYBACK 0
 #define CAPTURE 1
@@ -533,17 +528,12 @@ snd_au1000_ac97_new(void)
 {
 	int err;
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 	ac97_bus_t *pbus;
 	ac97_template_t ac97;
  	static ac97_bus_ops_t ops = {
 		.write = snd_au1000_ac97_write,
 		.read = snd_au1000_ac97_read,
 	};
-#else
-	ac97_bus_t bus, *pbus;
-	ac97_t ac97;
-#endif
 
 	if ((au1000->ac97_res_port = request_region(AC97C_CONFIG,
 	       		sizeof(au1000_ac97_reg_t), "Au1x00 AC97")) == NULL) {
@@ -575,16 +565,8 @@ snd_au1000_ac97_new(void)
 	spin_unlock(&au1000->ac97_lock);
 
 	/* Initialise AC97 middle-layer */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 	if ((err = snd_ac97_bus(au1000->card, 0, &ops, au1000, &pbus)) < 0)
  		return err;
-#else
-	memset(&bus, 0, sizeof(bus));
-	bus.write = snd_au1000_ac97_write;
-	bus.read = snd_au1000_ac97_read;
-	if ((err = snd_ac97_bus(au1000->card, &bus, &pbus)) < 0)
-		return err;
-#endif
 	memset(&ac97, 0, sizeof(ac97));
 	ac97.private_data = au1000;
 	ac97.private_free = snd_au1000_ac97_free;

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw

PATCH 1/1 Cleanup LINUX_VERSION_CODE in mtd/nand/au1550nd.

hi,

this patch removes LINUX_VERSION_CODE
from au1550nd.c.

drivers/mtd/nand/au1550nd.c renamed from drivers/mtd/nand/au1550nd.c.orig +0 -11
@@ -20,18 +20,7 @@
 #include <linux/version.h>
 #include <asm/io.h>
 
-/* fixme: this is ugly */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
 #include <asm/mach-au1x00/au1xxx.h>
-#else
-#include <asm/au1000.h>
-#ifdef CONFIG_MIPS_PB1550
-#include <asm/pb1550.h>
-#endif
-#ifdef CONFIG_MIPS_DB1550
-#include <asm/db1x00.h>
-#endif
-#endif
 
 /*
  * MTD structure for NAND controller

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors