Merge ../scsi-misc-2.6

[powerpc.git] / sound / pci / emu10k1 / io.c

diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index 7d0cb9d..029e785 100644 (file)
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -62,6 +62,8 @@ unsigned int snd_emu10k1_ptr_read(struct snd_emu10k1 * emu, unsigned int reg, un
        }
 }
 
+EXPORT_SYMBOL(snd_emu10k1_ptr_read);
+
 void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data)
 {
        unsigned int regptr;
@@ -92,6 +94,8 @@ void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned i
        }
 }
 
+EXPORT_SYMBOL(snd_emu10k1_ptr_write);
+
 unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, 
                                          unsigned int reg, 
                                          unsigned int chn)
@@ -130,30 +134,34 @@ int snd_emu10k1_spi_write(struct snd_emu10k1 * emu,
        unsigned int reset, set;
        unsigned int reg, tmp;
        int n, result;
-       if (emu->card_capabilities->ca0108_chip) {
-               reg=0x3c; /* PTR20, reg 0x3c */
-       } else {
-               return 1;  /* For other cards types the SPI register is currently unknown. */
+       if (emu->card_capabilities->ca0108_chip)
+               reg = 0x3c; /* PTR20, reg 0x3c */
+       else {
+               /* For other chip types the SPI register
+                * is currently unknown. */
+               return 1;
        }
-       if (data > 0xffff) return 1; /* Only 16bit values allowed */
+       if (data > 0xffff) /* Only 16bit values allowed */
+               return 1;
 
        tmp = snd_emu10k1_ptr20_read(emu, reg, 0);
-               reset = (tmp & ~0x3ffff) | 0x20000; /* Set xxx20000 */
+       reset = (tmp & ~0x3ffff) | 0x20000; /* Set xxx20000 */
        set = reset | 0x10000; /* Set xxx1xxxx */
        snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);
        tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* write post */
        snd_emu10k1_ptr20_write(emu, reg, 0, set | data);
        result = 1;
        /* Wait for status bit to return to 0 */
-       for (n=0;n<100;n++) {
+       for (n = 0; n < 100; n++) {
                udelay(10);
                tmp = snd_emu10k1_ptr20_read(emu, reg, 0);
                if (!(tmp & 0x10000)) {
-                       result=0;
+                       result = 0;
                        break;
                }
        }
-       if (result) return 1; /* Timed out */
+       if (result) /* Timed out */
+               return 1;
        snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);
        tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* Write post */
        return 0;