C99 initializers for sound/isa

PATCH New Art Haas 1 participant 1 message Mar 1, 2003 Sound

lore

Share & tools

lore

Art Haas

author

2003-03-01 18:44 UTC #0 lore raw

PATCH 1/1 C99 initializers for sound/isa

Hi.

Here are a set of patches for files in sound/isa that convert the files to use C99 initializers. The patches are against the current BK.

Art Haas

===== sound/isa/als100.c 1.7 vs edited =====

sound/isa/als100.c +3 -3

@@ -112,9 +112,9 @@
 #define ISAPNP_ALS100(_va, _vb, _vc, _device, _audio, _mpu401, _opl) \
         { \
                 ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-                devs : { ISAPNP_DEVICE_ID('@', '@', '@', _audio), \
-                         ISAPNP_DEVICE_ID('@', 'X', '@', _mpu401), \
-			 ISAPNP_DEVICE_ID('@', 'H', '@', _opl) } \
+                .devs = { ISAPNP_DEVICE_ID('@', '@', '@', _audio), \
+                          ISAPNP_DEVICE_ID('@', 'X', '@', _mpu401), \
+		 	  ISAPNP_DEVICE_ID('@', 'H', '@', _opl) } \
         }
 
 static struct isapnp_card_id snd_als100_pnpids[] __devinitdata = {

===== sound/isa/azt2320.c 1.7 vs edited =====

sound/isa/azt2320.c +2 -2

@@ -125,8 +125,8 @@
 #define ISAPNP_AZT2320(_va, _vb, _vc, _device, _audio, _mpu401) \
 	{ \
 		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
-			 ISAPNP_DEVICE_ID(_va, _vb, _vc, _mpu401), } \
+		.devs = { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
+			  ISAPNP_DEVICE_ID(_va, _vb, _vc, _mpu401), } \
 	}
 
 static struct isapnp_card_id snd_azt2320_pnpids[] __devinitdata = {

===== sound/isa/cmi8330.c 1.12 vs edited =====

sound/isa/cmi8330.c +2 -2

@@ -182,8 +182,8 @@
 #define ISAPNP_CMI8330(_va, _vb, _vc, _device, _audio1, _audio2) \
 	{ \
 		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID('@', '@', '@', _audio1), \
-			 ISAPNP_DEVICE_ID('@', 'X', '@', _audio2), } \
+		.devs = { ISAPNP_DEVICE_ID('@', '@', '@', _audio1), \
+			  ISAPNP_DEVICE_ID('@', 'X', '@', _audio2), } \
 	}
 
 static struct isapnp_card_id snd_cmi8330_pnpids[] __devinitdata =

===== sound/isa/dt019x.c 1.9 vs edited =====

sound/isa/dt019x.c +1 -1

@@ -111,7 +111,7 @@
 	/* DT0196 / ALS-007 */
 	{
 		ISAPNP_CARD_ID('A','L','S',0x0007),
-		devs: { ISAPNP_DEVICE_ID('@','@','@',0x0001),
+		.devs = { ISAPNP_DEVICE_ID('@','@','@',0x0001),
 			ISAPNP_DEVICE_ID('@','X','@',0x0001),
 			ISAPNP_DEVICE_ID('@','H','@',0x0001) }
 	},

===== sound/isa/es18xx.c 1.13 vs edited =====

sound/isa/es18xx.c +2 -2

@@ -1950,8 +1950,8 @@
 #define ISAPNP_ES18XX(_va, _vb, _vc, _device, _audio, _control) \
         { \
                 ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-                devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
-                         ISAPNP_DEVICE_ID(_va, _vb, _vc, _control) } \
+                .devs = { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
+                          ISAPNP_DEVICE_ID(_va, _vb, _vc, _control) } \
         }
 
 static struct isapnp_card_id snd_audiodrive_pnpids[] __devinitdata = {

===== sound/isa/opl3sa2.c 1.14 vs edited =====

sound/isa/opl3sa2.c +4 -4

@@ -166,13 +166,13 @@
 
 static struct pnp_card_id snd_opl3sa2_pnpids[] = {
 	/* Yamaha YMF719E-S (Genius Sound Maker 3DX) */
-	{.id = "YMH0020", .driver_data = 0, devs : { {.id="YMH0021"}, } },
+	{.id = "YMH0020", .driver_data = 0, .devs = { {.id="YMH0021"}, } },
 	/* Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard) */
-	{.id = "YMH0030", .driver_data = 0, devs : { {.id="YMH0021"}, } },
+	{.id = "YMH0030", .driver_data = 0, .devs = { {.id="YMH0021"}, } },
 	/* Yamaha OPL3-SA2 */
-	{.id = "YMH0800", .driver_data = 0, devs : { {.id="YMH0021"}, } },
+	{.id = "YMH0800", .driver_data = 0, .devs = { {.id="YMH0021"}, } },
 	/* NeoMagic MagicWave 3DX */
-	{.id = "NMX2200", .driver_data = 0, devs : { {.id="NMX2210"}, } },
+	{.id = "NMX2200", .driver_data = 0, .devs = { {.id="NMX2210"}, } },
 	/* --- */
 	{.id = "", } /* end */
 };

===== sound/isa/ad1816a/ad1816a.c 1.6 vs edited =====

sound/isa/ad1816a/ad1816a.c +2 -2

@@ -109,8 +109,8 @@
 #define ISAPNP_AD1816A(_va, _vb, _vc, _device, _fa, _fb, _fc, _audio, _mpu401) \
 	{ \
 		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID(_fa, _fb, _fc, _audio), \
-			 ISAPNP_DEVICE_ID(_fa, _fb, _fc, _mpu401), } \
+		.devs = { ISAPNP_DEVICE_ID(_fa, _fb, _fc, _audio), \
+			  ISAPNP_DEVICE_ID(_fa, _fb, _fc, _mpu401), } \
 	}
 
 static struct isapnp_card_id snd_ad1816a_pnpids[] __devinitdata = {

===== sound/isa/gus/gus_pcm.c 1.7 vs edited =====

sound/isa/gus/gus_pcm.c +1 -1

@@ -620,7 +620,7 @@
 static snd_pcm_hardware_t snd_gf1_pcm_playback =
 {
 	.info =			SNDRV_PCM_INFO_NONINTERLEAVED,
-	formats:		(SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
+	.formats		= (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
 				 SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE),
 	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
 	.rate_min =		5510,

===== sound/isa/gus/interwave.c 1.10 vs edited =====

sound/isa/gus/interwave.c +2 -2

@@ -148,12 +148,12 @@
 #define ISAPNP_INTERWAVE(_va, _vb, _vc, _device, _audio) \
 	{ \
 		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), } \
+		.devs = { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), } \
 	}
 #define ISAPNP_INTERWAVE_STB(_va, _vb, _vc, _device, _audio, _tone) \
 	{ \
 		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
+		.devs = { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
 			 ISAPNP_DEVICE_ID(_va, _vb, _vc, _tone), } \
 	}

===== sound/isa/sb/sb16.c 1.12 vs edited =====

sound/isa/sb/sb16.c +2 -2

@@ -168,12 +168,12 @@
 #define ISAPNP_SB16(_va, _vb, _vc, _device, _audio) \
 	{ \
 		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), } \
+		.devs = { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), } \
 	}
 #define ISAPNP_SBAWE(_va, _vb, _vc, _device, _audio, _awe) \
 	{ \
 		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
+		.devs = { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
 			 ISAPNP_DEVICE_ID(_va, _vb, _vc, _awe), } \
 	}

===== sound/isa/sb/sb8_main.c 1.4 vs edited =====

sound/isa/sb/sb8_main.c +1 -1

@@ -97,7 +97,7 @@
 {
 	snd_interval_t *r = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
 	if (r->min > SB8_RATE(22050) || r->max <= SB8_RATE(11025)) {
-		snd_interval_t t = { min: 1, max: 1 };
+		snd_interval_t t = { .min = 1, .max = 1 };
 		return snd_interval_refine(hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS), &t);
 	}
 	return 0;

Signature · 3 lines

They that can give up essential liberty to obtain a little temporary safety
deserve neither liberty nor safety.
 -- Benjamin Franklin, Historical Review of Pennsylvania, 1759