vserver 1.9.3

[linux-2.6.git] / sound / ppc / daca.c

diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
index 0b48286..6629b6b 100644 (file)
--- a/sound/ppc/daca.c
+++ b/sound/ppc/daca.c
@@ -28,8 +28,6 @@
 #include <sound/core.h>
 #include "pmac.h"
 
-#define chip_t pmac_t
-
 /* i2c address */
 #define DACA_I2C_ADDR  0x4d
 
@@ -217,8 +215,6 @@ static snd_kcontrol_new_t daca_mixers[] = {
        },
 };
 
-#define num_controls(ary) (sizeof(ary) / sizeof(snd_kcontrol_new_t))
-
 
 #ifdef CONFIG_PMAC_PBOOK
 static void daca_resume(pmac_t *chip)
@@ -272,7 +268,7 @@ int __init snd_pmac_daca_init(pmac_t *chip)
         */
        strcpy(chip->card->mixername, "PowerMac DACA");
 
-       for (i = 0; i < num_controls(daca_mixers); i++) {
+       for (i = 0; i < ARRAY_SIZE(daca_mixers); i++) {
                if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&daca_mixers[i], chip))) < 0)
                        return err;
        }