Changeset 135 for GPL/trunk/alsa-kernel


Ignore:
Timestamp:
Jun 13, 2007, 9:06:25 AM (18 years ago)
Author:
stevenhl
Message:

Get rid of spurious warnings

Location:
GPL/trunk/alsa-kernel
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk/alsa-kernel/core/memory.c

    r73 r135  
    269269            return -EFAULT;
    270270        count -= c;
    271         (char*)dst += c;
    272         (char*)src += c;
     271        dst = (char*)dst + c;
     272        src = (char*)src + c;
    273273    }
    274274    return 0;
    … …  
    300300        memcpy_toio((void*)dst, buf, c);
    301301        count -= c;
    302         (char*)dst += c;
    303         (char*)src += c;
     302        dst = (char*)dst + c;
     303        src = (char*)src + c;
    304304    }
    305305    return 0;

  • GPL/trunk/alsa-kernel/core/rawmidi.c

    r34 r135  
    2121
    2222#define SNDRV_MAIN_OBJECT_FILE
     23
     24#define INCL_NOPMAPI
     25#include <os2.h>
     26#include <ossdefos2.h>
     27#include <ossidc32.h>
     28
    2329#include <sound/driver.h>
    2430#include <sound/rawmidi.h>
    … …  
    837843 * Returns the size of read data, or a negative error code on failure.
    838844 */
     845
    839846int snd_rawmidi_receive(snd_rawmidi_substream_t * substream, const unsigned char *buffer, int count)
    840847{

  • GPL/trunk/alsa-kernel/core/seq/seq_clientmgr.c

    r129 r135  
    21812181
    21822182
    2183 static long snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
     2183static int snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
    21842184{
    21852185        struct snd_seq_client *client = file->private_data;

  • GPL/trunk/alsa-kernel/drivers/dummy.c

    r32 r135  
    227227    bps *= snd_pcm_format_width(runtime->format);
    228228    bps /= 8;
    229     if (bps <= 0)
     229    if (bps == 0)
    230230        return -EINVAL;
    231231    dpcm->pcm_bps = bps;
    … …  
    323323}
    324324
     325// 12 Jun 07 SHL fixme to be in some .h
     326extern void * snd_malloc_pages_fallback(size_t size, unsigned int flags, size_t *res_size);
     327
    325328static int snd_card_dummy_playback_open(snd_pcm_substream_t * substream)
    326329{
    … …  
    438441    0, 0, snd_dummy_volume_info, \
    439442    snd_dummy_volume_get, snd_dummy_volume_put, \
     443    0, \
    440444    addr }
    441445

  • GPL/trunk/alsa-kernel/isa/opl3sa2.c

    r32 r135  
    161161static unsigned char snd_opl3sa_read(unsigned long port, unsigned char reg)
    162162{
    163         unsigned long flags;
     163        u32 flags;
    164164        unsigned char result;
    165165
    166         save_flags(flags);
     166        save_flags(&flags);     // 12 Jun 07 SHL
    167167        cli();
    168168#if 0
    … …  
    182182                             unsigned char reg, unsigned char value)
    183183{
    184         unsigned long flags;
    185 
    186         save_flags(flags);
     184        u32 flags;
     185
     186        save_flags(&flags);
    187187        cli();
    188188#if 0
    … …  
    261261}
    262262
    263 static void snd_opl3sa_interrupt(int irq, void *dev_id, struct pt_regs *regs)
     263static int snd_opl3sa_interrupt(int irq, void *dev_id, struct pt_regs *regs)
    264264{
    265265        unsigned short status;
    … …  
    267267
    268268        if (oplcard == NULL || oplcard->card == NULL)
    269                 return;
     269                return 0;
    270270
    271271        spin_lock(&oplcard->reg_lock);
    … …  
    290290                snd_ctl_notify(oplcard->card, SNDRV_CTL_EVENT_MASK_VALUE, &oplcard->master_volume->id);
    291291        }
     292        return 0;
    292293}
    293294
    … …  
    297298  0, 0, snd_opl3sa_info_single, \
    298299  snd_opl3sa_get_single, snd_opl3sa_put_single, \
     300  0, \
    299301  reg | (shift << 8) | (mask << 16) | (invert << 24) }
    300302
    … …  
    364366  0, 0, snd_opl3sa_info_double, \
    365367  snd_opl3sa_get_double, snd_opl3sa_put_double, \
     368  0, \
    366369  left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
    367370

  • GPL/trunk/alsa-kernel/pci/ali5451/ali5451.c

    r34 r135  
    18001800    { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, xindex,\
    18011801    0, 0, snd_ali5451_spdif_info, snd_ali5451_spdif_get, \
    1802     snd_ali5451_spdif_put, value}
     1802    snd_ali5451_spdif_put, 0, value}
    18031803#else
    18041804#define ALI5451_SPDIF(xname, xindex, value) \
    … …  
    19251925    int err;
    19261926    static ac97_bus_ops_t ops = {
    1927         0,snd_ali_codec_write,
     1927        0,0,
     1928        snd_ali_codec_write,
    19281929        snd_ali_codec_read,0,0
    19291930    };
    … …  
    20332034    if (codec->hw_initialized)
    20342035        snd_ali_disable_address_interrupt(codec);
    2035     if (codec->irq >= 0) {
     2036    // if (codec->irq >= 0) {   // 12 Jun 07 SHL avoid warning
    20362037        synchronize_irq(codec->irq);
    20372038        free_irq(codec->irq, (void *)codec);
    2038     }
     2039    // }        // 12 Jun 07 SHL
    20392040    if (codec->port)
    20402041        pci_release_regions(codec->pci);

  • GPL/trunk/alsa-kernel/pci/cmipci.c

    r77 r135  
    18421842    0, 0, snd_cmipci_info_volume, \
    18431843    snd_cmipci_get_volume, snd_cmipci_put_volume, \
     1844    0,\
    18441845    COMPOSE_SB_REG(left_reg, right_reg, left_shift, right_shift, mask, invert, stereo), \
    18451846    }
    … …  
    19431944    0, 0, snd_cmipci_info_input_sw, \
    19441945    snd_cmipci_get_input_sw, snd_cmipci_put_input_sw, \
     1946    0, \
    19451947    COMPOSE_SB_REG(SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, left_shift, right_shift, 1, 0, 1), \
    19461948    }
    … …  
    20072009    0, 0, snd_cmipci_info_native_mixer, \
    20082010    snd_cmipci_get_native_mixer, snd_cmipci_put_native_mixer, \
     2011    0, \
    20092012    COMPOSE_SB_REG(reg, reg, lshift, rshift, 1, invert, 1), \
    20102013    }
    … …  
    20142017    0, 0, snd_cmipci_info_native_mixer, \
    20152018    snd_cmipci_get_native_mixer, snd_cmipci_put_native_mixer, \
     2019    0, \
    20162020    COMPOSE_SB_REG(reg, reg, shift, shift, 1, invert, 0), \
    20172021    }
    … …  
    20212025    0, 0, snd_cmipci_info_native_mixer, \
    20222026    snd_cmipci_get_native_mixer, snd_cmipci_put_native_mixer, \
     2027    0, \
    20232028    COMPOSE_SB_REG(reg, reg, lshift, rshift, mask, 0, 1), \
    20242029    }
    … …  
    20282033    0, 0, snd_cmipci_info_native_mixer, \
    20292034    snd_cmipci_get_native_mixer, snd_cmipci_put_native_mixer, \
     2035    0, \
    20302036    COMPOSE_SB_REG(reg, reg, shift, shift, mask, 0, 0), \
    20312037    }
    … …  
    21282134        snd_cmipci_get_native_mixer_sensitive,
    21292135        snd_cmipci_put_native_mixer_sensitive,
     2136        0,
    21302137        COMPOSE_SB_REG(CM_REG_MIXER1, CM_REG_MIXER1, CM_WSMUTE_SHIFT, CM_WSMUTE_SHIFT, 1, 1, 0),
    21312138    },
    … …  
    23032310    snd_cmipci_uswitch_get, \
    23042311    snd_cmipci_uswitch_put, \
     2312    0, \
    23052313    (unsigned long)&cmipci_switch_arg_##sarg,\
    23062314    }

  • GPL/trunk/alsa-kernel/pci/cs4281.c

    r77 r135  
    11021102static snd_kcontrol_new_t snd_cs4281_fm_vol =
    11031103{
    1104     /*  .iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
    1105     /*  .name = */"Synth Playback Volume",0,0,0,
    1106     /*  .info = */snd_cs4281_info_volume,
    1107     /*  .get = */snd_cs4281_get_volume,
    1108     /*  .put = */snd_cs4281_put_volume,
    1109     /*  .private_value = */((BA0_FMLVC << 16) | BA0_FMRVC),
     1104    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
     1105    .name = "Synth Playback Volume",
     1106    .info = snd_cs4281_info_volume,
     1107    .get = snd_cs4281_get_volume,
     1108    .put = snd_cs4281_put_volume,
     1109    .private_value = ((BA0_FMLVC << 16) | BA0_FMRVC)
    11101110};
    11111111
    11121112static snd_kcontrol_new_t snd_cs4281_pcm_vol =
    11131113{
    1114     /*  .iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
    1115     /*  .name = */"PCM Stream Playback Volume",0,0,0,
    1116     /*  .info = */snd_cs4281_info_volume,
    1117     /*  .get = */snd_cs4281_get_volume,
    1118     /*  .put = */snd_cs4281_put_volume,
    1119     /*  .private_value = */ ((BA0_PPLVC << 16) | BA0_PPRVC),
     1114    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
     1115    .name = "PCM Stream Playback Volume",
     1116    .info = snd_cs4281_info_volume,
     1117    .get = snd_cs4281_get_volume,
     1118    .put = snd_cs4281_put_volume,
     1119    .private_value = ((BA0_PPLVC << 16) | BA0_PPRVC)
    11201120};
    11211121
    … …  
    11421142    int err;
    11431143    static ac97_bus_ops_t ops = {
    1144         0,
     1144        0,0,
    11451145        snd_cs4281_ac97_write,
    11461146        snd_cs4281_ac97_read,
    … …  
    19351935
    19361936    if (cmd & OPL3_RIGHT)
    1937         port = (unsigned long)chip->ba0 + BA0_B1AP; /* right port */
     1937        port = (void *)chip->ba0 + BA0_B1AP; /* right port */
    19381938    else
    1939         port = (unsigned long)chip->ba0 + BA0_B0AP; /* left port */
     1939        port = (void *)chip->ba0 + BA0_B0AP; /* left port */
    19401940
    19411941    spin_lock_irqsave(&opl3->reg_lock, flags);

  • GPL/trunk/alsa-kernel/pci/es1968.c

    r77 r135  
    20412041    int err;
    20422042    static ac97_bus_ops_t ops = {
    2043         0, snd_es1968_ac97_write,
     2043        0, 0, snd_es1968_ac97_write,
    20442044        snd_es1968_ac97_read,0,0
    20452045    };

  • GPL/trunk/alsa-kernel/pci/fm801.c

    r77 r135  
    10021002{ SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, 0,0,0, snd_fm801_info_single, \
    10031003  snd_fm801_get_single, snd_fm801_put_single, \
    1004   reg | (shift << 8) | (mask << 16) | (invert << 24) }
     1004  0, reg | (shift << 8) | (mask << 16) | (invert << 24) }
    10051005
    10061006static int snd_fm801_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
    … …  
    10471047{ SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, 0,0,0, snd_fm801_info_double, \
    10481048  snd_fm801_get_double, snd_fm801_put_double, \
    1049   reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
     1049  0, reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
    10501050
    10511051static int snd_fm801_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
    … …  
    11891189        int err;
    11901190        static ac97_bus_ops_t ops = {
    1191             0, snd_fm801_codec_write,
     1191            0, 0, snd_fm801_codec_write,
    11921192            snd_fm801_codec_read, 0,0
    11931193        };

  • GPL/trunk/alsa-kernel/pci/intel8x0.c

    r88 r135  
    32383238}
    32393239
     3240#if 0 // fixme to be gone?
    32403241static void __devexit snd_intel8x0_joystick_remove(struct pci_dev *pci)
    32413242{
    … …  
    32533254    pci_write_config_word(pci, 0xe6, val);
    32543255}
     3256#endif // fixme to be gone
    32553257
    32563258static struct pci_device_id snd_intel8x0_joystick_ids[] = {

  • GPL/trunk/alsa-kernel/pci/maestro3.c

    r77 r135  
    21262126    int err;
    21272127    static ac97_bus_ops_t ops = {
    2128         0,snd_m3_ac97_write,
    2129         snd_m3_ac97_read,0,0
     2128        .write = snd_m3_ac97_write,
     2129        .read = snd_m3_ac97_read
    21302130    };
    21312131

  • GPL/trunk/alsa-kernel/pci/trident/trident.c

    r77 r135  
    7878MODULE_DEVICE_TABLE(pci, snd_trident_ids);
    7979
     80// 12 Jun 07 SHL fixme to be in some .h
     81void __devinit snd_trident_gameport(struct snd_trident *chip);
     82
    8083static int __devinit snd_trident_probe(struct pci_dev *pci,
    8184                                       const struct pci_device_id *pci_id)

  • GPL/trunk/alsa-kernel/pci/trident/trident_main.c

    r84 r135  
    145145
    146146/*---------------------------------------------------------------------------
    147  void snd_trident_codec_write(ac97_t *ac97, unsigned short reg, unsigned short wdata)
     147 void snd_trident_codec_write(ac97_t *ac97, unsigned short reg, unsigned short wdata unsigned short unused)
    148148
    149149 Description: This routine will do all of the writing to the external
    … …  
    23552355    snd_trident_spdif_control_get,
    23562356    snd_trident_spdif_control_put,
     2357    0,
    23572358    0x28,
    23582359};
    … …  
    25672568    snd_trident_ac97_control_get,
    25682569    snd_trident_ac97_control_put,
     2570    0,
    25692571    4,
    25702572};
    … …  
    26232625    snd_trident_vol_control_get,
    26242626    snd_trident_vol_control_put,
    2625     16,
     2627    0,                  // tlv
     2628    16                  // private
    26262629};
    26272630
    … …  
    29402943    int idx, err, retries = 2;
    29412944    static ac97_bus_ops_t ops = {
    2942         0,snd_trident_codec_write,
    2943         snd_trident_codec_read,0,0
     2945        0,              // reset
     2946        0,              // warm_reset
     2947        snd_trident_codec_write,
     2948        snd_trident_codec_read,
     2949        0,              // wait
     2950        0               // init
    29442951    };
    29452952    uctl = kcalloc(1, sizeof(*uctl), GFP_KERNEL);

  • GPL/trunk/alsa-kernel/pci/via82xx.c

    r85 r135  
    618618 *  Used for 686 and 8233A
    619619 */
    620 static irqreturn_t snd_via686_interrupt(int irq, void *dev_id)
     620static irqreturn_t snd_via686_interrupt(int irq, void *dev_id, struct pt_regs *unused)
    621621{
    622622        struct via82xx *chip = dev_id;
    … …  
    664664 *  Interrupt handler
    665665 */
    666 static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id)
     666static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id,struct pt_regs *unused)
    667667{
    668668        struct via82xx *chip = dev_id;
    … …  
    23112311        if (request_irq(pci->irq,
    23122312                        chip_type == TYPE_VIA8233 ?
    2313                         snd_via8233_interrupt : snd_via686_interrupt,
     2313                          snd_via8233_interrupt : snd_via686_interrupt,
    23142314                        SA_INTERRUPT|SA_SHIRQ,
    23152315                        card->driver, chip)) {

  • GPL/trunk/alsa-kernel/synth/emux/soundfont.c

    r77 r135  
    142142
    143143        count -= sizeof(patch);
    144         (char*)data += sizeof(patch);
     144        data = (char*)data + sizeof(patch);
    145145
    146146        if (patch.key != SNDRV_OSS_SOUNDFONT_PATCH) {
    … …  
    539539                return -EFAULT;
    540540       
    541         (char*)data += sizeof(hdr);
     541        data = (char*)data + sizeof(hdr);
    542542        count -= sizeof(hdr);
    543543
    544         if (hdr.nvoices <= 0 || hdr.nvoices >= 100) {
     544        if ((signed char)hdr.nvoices <= 0 || hdr.nvoices >= 100) {
    545545                printk("Soundfont error: Illegal voice number %d\n", hdr.nvoices);
    546546                return -EINVAL;
    … …  
    578578                }
    579579
    580                 (char*)data += sizeof(tmpzone.v);
     580                data = (char*)data + sizeof(tmpzone.v);
    581581                count -= sizeof(tmpzone.v);
    582582
Note: See TracChangeset for help on using the changeset viewer.