Merge tag 'thermal-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/therma...

[linux-2.6-microblaze.git] / sound / ppc / tumbler.c

diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 6e5bdaa..c65e74d 100644 (file)
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -402,7 +402,8 @@ static int tumbler_get_drc_value(struct snd_kcontrol *kcontrol,
 {
        struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
        struct pmac_tumbler *mix;
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        ucontrol->value.integer.value[0] = mix->drc_range;
        return 0;
@@ -416,7 +417,8 @@ static int tumbler_put_drc_value(struct snd_kcontrol *kcontrol,
        unsigned int val;
        int change;
 
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        val = ucontrol->value.integer.value[0];
        if (chip->model == PMAC_TUMBLER) {
@@ -442,7 +444,8 @@ static int tumbler_get_drc_switch(struct snd_kcontrol *kcontrol,
 {
        struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
        struct pmac_tumbler *mix;
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        ucontrol->value.integer.value[0] = mix->drc_enable;
        return 0;
@@ -455,7 +458,8 @@ static int tumbler_put_drc_switch(struct snd_kcontrol *kcontrol,
        struct pmac_tumbler *mix;
        int change;
 
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        change = mix->drc_enable != ucontrol->value.integer.value[0];
        if (change) {
@@ -524,7 +528,8 @@ static int tumbler_get_mono(struct snd_kcontrol *kcontrol,
        struct tumbler_mono_vol *info = (struct tumbler_mono_vol *)kcontrol->private_value;
        struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
        struct pmac_tumbler *mix;
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        ucontrol->value.integer.value[0] = mix->mono_vol[info->index];
        return 0;
@@ -539,7 +544,8 @@ static int tumbler_put_mono(struct snd_kcontrol *kcontrol,
        unsigned int vol;
        int change;
 
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        vol = ucontrol->value.integer.value[0];
        if (vol >= info->max)
@@ -669,7 +675,8 @@ static int snapper_get_mix(struct snd_kcontrol *kcontrol,
        int idx = (int)kcontrol->private_value;
        struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
        struct pmac_tumbler *mix;
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        ucontrol->value.integer.value[0] = mix->mix_vol[idx][0];
        ucontrol->value.integer.value[1] = mix->mix_vol[idx][1];
@@ -685,7 +692,8 @@ static int snapper_put_mix(struct snd_kcontrol *kcontrol,
        unsigned int vol[2];
        int change;
 
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        vol[0] = ucontrol->value.integer.value[0];
        vol[1] = ucontrol->value.integer.value[1];
@@ -716,7 +724,8 @@ static int tumbler_get_mute_switch(struct snd_kcontrol *kcontrol,
        struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
        struct pmac_tumbler *mix;
        struct pmac_gpio *gp;
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        switch(kcontrol->private_value) {
        case TUMBLER_MUTE_HP:
@@ -745,7 +754,8 @@ static int tumbler_put_mute_switch(struct snd_kcontrol *kcontrol,
        if (chip->update_automute && chip->auto_mute)
                return 0; /* don't touch in the auto-mute mode */
 #endif 
-       if (! (mix = chip->mixer_data))
+       mix = chip->mixer_data;
+       if (!mix)
                return -ENODEV;
        switch(kcontrol->private_value) {
        case TUMBLER_MUTE_HP:
@@ -1361,7 +1371,8 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
                        break;
                }
        }
-       if ((err = tumbler_init(chip)) < 0)
+       err = tumbler_init(chip);
+       if (err < 0)
                return err;
 
        /* set up TAS */
@@ -1392,7 +1403,8 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
                chipname = "Snapper";
        }
 
-       if ((err = snd_pmac_keywest_init(&mix->i2c)) < 0)
+       err = snd_pmac_keywest_init(&mix->i2c);
+       if (err < 0)
                return err;
 
        /*
@@ -1402,28 +1414,34 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
 
        if (chip->model == PMAC_TUMBLER) {
                for (i = 0; i < ARRAY_SIZE(tumbler_mixers); i++) {
-                       if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&tumbler_mixers[i], chip))) < 0)
+                       err = snd_ctl_add(chip->card, snd_ctl_new1(&tumbler_mixers[i], chip));
+                       if (err < 0)
                                return err;
                }
        } else {
                for (i = 0; i < ARRAY_SIZE(snapper_mixers); i++) {
-                       if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snapper_mixers[i], chip))) < 0)
+                       err = snd_ctl_add(chip->card, snd_ctl_new1(&snapper_mixers[i], chip));
+                       if (err < 0)
                                return err;
                }
        }
        chip->master_sw_ctl = snd_ctl_new1(&tumbler_hp_sw, chip);
-       if ((err = snd_ctl_add(chip->card, chip->master_sw_ctl)) < 0)
+       err = snd_ctl_add(chip->card, chip->master_sw_ctl);
+       if (err < 0)
                return err;
        chip->speaker_sw_ctl = snd_ctl_new1(&tumbler_speaker_sw, chip);
-       if ((err = snd_ctl_add(chip->card, chip->speaker_sw_ctl)) < 0)
+       err = snd_ctl_add(chip->card, chip->speaker_sw_ctl);
+       if (err < 0)
                return err;
        if (mix->line_mute.addr != 0) {
                chip->lineout_sw_ctl = snd_ctl_new1(&tumbler_lineout_sw, chip);
-               if ((err = snd_ctl_add(chip->card, chip->lineout_sw_ctl)) < 0)
+               err = snd_ctl_add(chip->card, chip->lineout_sw_ctl);
+               if (err < 0)
                        return err;
        }
        chip->drc_sw_ctl = snd_ctl_new1(&tumbler_drc_sw, chip);
-       if ((err = snd_ctl_add(chip->card, chip->drc_sw_ctl)) < 0)
+       err = snd_ctl_add(chip->card, chip->drc_sw_ctl);
+       if (err < 0)
                return err;
 
        /* set initial DRC range to 60% */
@@ -1446,9 +1464,11 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
        device_change_chip = chip;
 
 #ifdef PMAC_SUPPORT_AUTOMUTE
-       if ((mix->headphone_irq >=0 || mix->lineout_irq >= 0)
-           && (err = snd_pmac_add_automute(chip)) < 0)
-               return err;
+       if (mix->headphone_irq >= 0 || mix->lineout_irq >= 0) {
+               err = snd_pmac_add_automute(chip);
+               if (err < 0)
+                       return err;
+       }
        chip->detect_headphone = tumbler_detect_headphone;
        chip->update_automute = tumbler_update_automute;
        tumbler_update_automute(chip, 0); /* update the status only */
@@ -1456,8 +1476,9 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
        /* activate headphone status interrupts */
        if (mix->headphone_irq >= 0) {
                unsigned char val;
-               if ((err = request_irq(mix->headphone_irq, headphone_intr, 0,
-                                      "Sound Headphone Detection", chip)) < 0)
+               err = request_irq(mix->headphone_irq, headphone_intr, 0,
+                                 "Sound Headphone Detection", chip);
+               if (err < 0)
                        return 0;
                /* activate headphone status interrupts */
                val = do_gpio_read(&mix->hp_detect);
@@ -1465,8 +1486,9 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
        }
        if (mix->lineout_irq >= 0) {
                unsigned char val;
-               if ((err = request_irq(mix->lineout_irq, headphone_intr, 0,
-                                      "Sound Lineout Detection", chip)) < 0)
+               err = request_irq(mix->lineout_irq, headphone_intr, 0,
+                                 "Sound Lineout Detection", chip);
+               if (err < 0)
                        return 0;
                /* activate headphone status interrupts */
                val = do_gpio_read(&mix->line_detect);