Ignore:
Timestamp:
Jun 17, 2007, 1:16:58 AM (18 years ago)
Author:
Brendan Oakley
Message:

Applied fixes from trunk to ReSync branch, fixed up additional conflicts, errors, and warnings.

Location:
GPL/branches/alsa-resync1/alsa-kernel/pci
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/alsa-resync1/alsa-kernel/pci/ac97/ac97_codec.c

    r86 r206  
    19311931}
    19321932
     1933#if 0 // fixme to be gone?
    19331934/* stop no dev release warning */
    19341935static void ac97_device_release(struct device * dev)
    19351936{
    19361937}
     1938#endif // fixme to be gone?
    19371939
    19381940/* register ac97 codec to bus */
    19391941static int snd_ac97_dev_register(struct snd_device *device)
    19401942{
    1941 #if 0
     1943#if 0 // fixme to be gone?
    19421944    struct snd_ac97 *ac97 = device->device_data;
    19431945        int err;
    … …  
    19541956                return err;
    19551957        }
    1956 #endif
     1958#endif // fixme to be gone?
    19571959        return 0;
    19581960}
    … …  
    23212323        power |= AC97_PD_PR2 | AC97_PD_PR3;     /* Analog Mixer powerdown */
    23222324        snd_ac97_write(ac97, AC97_POWERDOWN, power);
     2325#ifdef CONFIG_SND_AC97_POWER_SAVE
    23232326        if (ac97_is_power_save_mode(ac97)) {
    23242327            udelay(100);
    … …  
    23282331            snd_ac97_write(ac97, AC97_POWERDOWN, power);
    23292332        }
     2333#endif // CONFIG_SND_AC97_POWER_SAVE
    23302334}
    23312335

  • GPL/branches/alsa-resync1/alsa-kernel/pci/ac97/ac97_patch.c

    r86 r206  
    20812081        unsigned short val;
    20822082
    2083         if (ucontrol->value.enumerated.item[0] > 3
    2084             || ucontrol->value.enumerated.item[0] < 0)
     2083        // if (ucontrol->value.enumerated.item[0] > 3   // 12 Jun 07 SHL
     2084        //    || ucontrol->value.enumerated.item[0] < 0)        // 12 Jun 07 SHL
     2085        if (ucontrol->value.enumerated.item[0] > 3)
    20852086                return -EINVAL;
    20862087        val = ctrl2reg[ucontrol->value.enumerated.item[0]]

  • GPL/branches/alsa-resync1/alsa-kernel/pci/ali5451/ali5451.c

    r92 r206  
    18051805    { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, xindex,\
    18061806    0, 0, snd_ali5451_spdif_info, snd_ali5451_spdif_get, \
    1807     snd_ali5451_spdif_put, value}
     1807    snd_ali5451_spdif_put, 0, value}
    18081808#else
    18091809#define ALI5451_SPDIF(xname, xindex, value) \
    … …  
    19301930    int err;
    19311931    static ac97_bus_ops_t ops = {
    1932         0,snd_ali_codec_write,
     1932        0,0,
     1933        snd_ali_codec_write,
    19331934        snd_ali_codec_read,0,0
    19341935    };
    … …  
    20382039    if (codec->hw_initialized)
    20392040        snd_ali_disable_address_interrupt(codec);
    2040     if (codec->irq >= 0) {
     2041    // if (codec->irq >= 0) {   // 12 Jun 07 SHL avoid warning
    20412042        synchronize_irq(codec->irq);
    20422043        free_irq(codec->irq, (void *)codec);
    2043     }
     2044    // }        // 12 Jun 07 SHL
    20442045    if (codec->port)
    20452046        pci_release_regions(codec->pci);

  • GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c

    r77 r206  
    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/branches/alsa-resync1/alsa-kernel/pci/cs4281.c

    r77 r206  
    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/branches/alsa-resync1/alsa-kernel/pci/emu10k1/emu10k1x.c

    r84 r206  
    780780}
    781781
    782 static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id)
     782static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id, struct pt_regs *unused)
    783783{
    784784    unsigned int status;

  • GPL/branches/alsa-resync1/alsa-kernel/pci/emu10k1/emuproc.c

    r34 r206  
    176176
    177177    struct snd_emu10k1 *emu = entry->private_data;
    178     unsigned int val;
     178    unsigned int val = 0;               // 11 Jun 07 SHL fixme to know why not used
    179179    int nefx = emu->audigy ? 64 : 32;
    180180    char **outputs = emu->audigy ? audigy_outs : creative_outs;

  • GPL/branches/alsa-resync1/alsa-kernel/pci/emu10k1/irq.c

    r84 r206  
    3232#include <sound/emu10k1.h>
    3333
    34 irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)
     34irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *notused)
    3535{
    3636    struct snd_emu10k1 *emu = dev_id;

  • GPL/branches/alsa-resync1/alsa-kernel/pci/es1968.c

    r112 r206  
    20532053    int err;
    20542054    static ac97_bus_ops_t ops = {
    2055         0, snd_es1968_ac97_write,
     2055        0, 0, snd_es1968_ac97_write,
    20562056        snd_es1968_ac97_read,0,0
    20572057    };

  • GPL/branches/alsa-resync1/alsa-kernel/pci/fm801.c

    r77 r206  
    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/branches/alsa-resync1/alsa-kernel/pci/hda/hda_intel.c

    r86 r206  
    398398 * Compiler should optimize and eliminate the code if dma_addr_t is 32bit
    399399 */
    400 #define upper_32bit(addr) (sizeof(addr) > 4 ? (u32)((addr) >> 32) : (u32)0)
     400#define upper_32bit(addr) (sizeof(addr) > 4 ? (u32)(((unsigned long long)addr) >> 32) : (u32)0)
    401401
    402402static int azx_acquire_irq(struct azx *chip, int do_disconnect);

  • GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c

    r88 r206  
    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/branches/alsa-resync1/alsa-kernel/pci/maestro3.c

    r106 r206  
    21342134    int err;
    21352135    static ac97_bus_ops_t ops = {
    2136         0,snd_m3_ac97_write,
    2137         snd_m3_ac97_read,0,0
     2136        .write = snd_m3_ac97_write,
     2137        .read = snd_m3_ac97_read
    21382138    };
    21392139

  • GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident.c

    r92 r206  
    7979MODULE_DEVICE_TABLE(pci, snd_trident_ids);
    8080
     81// 12 Jun 07 SHL fixme to be in some .h
     82void __devinit snd_trident_gameport(struct snd_trident *chip);
     83
    8184static int __devinit snd_trident_probe(struct pci_dev *pci,
    8285                                       const struct pci_device_id *pci_id)

  • GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident_main.c

    r106 r206  
    152152
    153153/*---------------------------------------------------------------------------
    154  void snd_trident_codec_write(ac97_t *ac97, unsigned short reg, unsigned short wdata)
     154 void snd_trident_codec_write(ac97_t *ac97, unsigned short reg, unsigned short wdata unsigned short unused)
    155155
    156156 Description: This routine will do all of the writing to the external
    … …  
    23622362    snd_trident_spdif_control_get,
    23632363    snd_trident_spdif_control_put,
     2364    0,
    23642365    0x28,
    23652366};
    … …  
    25742575    snd_trident_ac97_control_get,
    25752576    snd_trident_ac97_control_put,
     2577    0,
    25762578    4,
    25772579};
    … …  
    26302632    snd_trident_vol_control_get,
    26312633    snd_trident_vol_control_put,
    2632     16,
     2634    0,                  // tlv
     2635    16                  // private
    26332636};
    26342637
    … …  
    29472950    int idx, err, retries = 2;
    29482951    static ac97_bus_ops_t ops = {
    2949         0,snd_trident_codec_write,
    2950         snd_trident_codec_read,0,0
     2952        0,              // reset
     2953        0,              // warm_reset
     2954        snd_trident_codec_write,
     2955        snd_trident_codec_read,
     2956        0,              // wait
     2957        0               // init
    29512958    };
    29522959    uctl = kcalloc(1, sizeof(*uctl), GFP_KERNEL);

  • GPL/branches/alsa-resync1/alsa-kernel/pci/via82xx.c

    r85 r206  
    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)) {
Note: See TracChangeset for help on using the changeset viewer.