[XFS] Fix merge failures

[pandora-kernel.git] / drivers / isdn / mISDN / dsp_tones.c

diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c
index 23dd0dd..7a9af66 100644 (file)
--- a/drivers/isdn/mISDN/dsp_tones.c
+++ b/drivers/isdn/mISDN/dsp_tones.c
@@ -231,120 +231,120 @@ dsp_audio_generate_ulaw_samples(void)
  * tone sequence definition *
  ****************************/
 
-struct pattern {
+static struct pattern {
        int tone;
        u8 *data[10];
        u32 *siz[10];
        u32 seq[10];
 } pattern[] = {
        {TONE_GERMAN_DIALTONE,
-       {DATA_GA, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GA, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GA, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GA, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {1900, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_OLDDIALTONE,
-       {DATA_GO, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GO, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GO, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GO, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {1998, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_AMERICAN_DIALTONE,
-       {DATA_DT, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_DT, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_DT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_DT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_DIALPBX,
-       {DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, 0, 0, 0, 0},
-       {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, 0, 0, 0, 0},
+       {DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL, NULL},
+       {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL},
        {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
 
        {TONE_GERMAN_OLDDIALPBX,
-       {DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, 0, 0, 0, 0},
-       {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, 0, 0, 0, 0},
+       {DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL},
+       {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL},
        {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
 
        {TONE_AMERICAN_DIALPBX,
-       {DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, 0, 0, 0, 0},
-       {SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, 0, 0, 0, 0},
+       {DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, NULL, NULL, NULL, NULL},
+       {SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, NULL, NULL, NULL, NULL},
        {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
 
        {TONE_GERMAN_RINGING,
-       {DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {8000, 32000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_OLDRINGING,
-       {DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {8000, 40000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_AMERICAN_RINGING,
-       {DATA_RI, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_RI, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_RI, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_RI, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {8000, 32000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_RINGPBX,
-       {DATA_GA, DATA_S, DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0},
-       {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0},
+       {DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL},
        {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_OLDRINGPBX,
-       {DATA_GO, DATA_S, DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0},
-       {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0},
+       {DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL},
        {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} },
 
        {TONE_AMERICAN_RINGPBX,
-       {DATA_RI, DATA_S, DATA_RI, DATA_S, 0, 0, 0, 0, 0, 0},
-       {SIZE_RI, SIZE_S, SIZE_RI, SIZE_S, 0, 0, 0, 0, 0, 0},
+       {DATA_RI, DATA_S, DATA_RI, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_RI, SIZE_S, SIZE_RI, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL},
        {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_BUSY,
-       {DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_OLDBUSY,
-       {DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {1000, 5000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_AMERICAN_BUSY,
-       {DATA_BU, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_BU, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_BU, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_BU, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_HANGUP,
-       {DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_OLDHANGUP,
-       {DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {1000, 5000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_AMERICAN_HANGUP,
-       {DATA_DT, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_DT, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_DT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_DT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_SPECIAL_INFO,
-       {DATA_S1, DATA_S2, DATA_S3, DATA_S, 0, 0, 0, 0, 0, 0},
-       {SIZE_S1, SIZE_S2, SIZE_S3, SIZE_S, 0, 0, 0, 0, 0, 0},
+       {DATA_S1, DATA_S2, DATA_S3, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_S1, SIZE_S2, SIZE_S3, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL},
        {2666, 2666, 2666, 8002, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_GASSENBESETZT,
-       {DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0},
-       {SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0},
+       {DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0} },
 
        {TONE_GERMAN_AUFSCHALTTON,
-       {DATA_GO, DATA_S, DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0},
-       {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0},
+       {DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL},
+       {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL},
        {1000, 5000, 1000, 17000, 0, 0, 0, 0, 0, 0} },
 
        {0,
-       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+       {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+       {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
 };
 
@@ -467,7 +467,7 @@ dsp_tone_timeout(void *arg)
 
        /* set next tone */
        if (pat->data[index] == DATA_S)
-               dsp_tone_hw_message(dsp, 0, 0);
+               dsp_tone_hw_message(dsp, NULL, 0);
        else
                dsp_tone_hw_message(dsp, pat->data[index], *(pat->siz[index]));
        /* set timer */