ALSA: hda/ca0132: Don't test for QUIRK_NONE
authorAlastair Bridgewater <alastair.bridgewater@gmail.com>
Sat, 16 Jun 2018 01:56:18 +0000 (21:56 -0400)
committerTakashi Iwai <tiwai@suse.de>
Sun, 17 Jun 2018 06:44:55 +0000 (08:44 +0200)
QUIRK_NONE is, quite explicitly, the default case.  The entire
point of a quirks system is to allow "programming by difference"
from a given base case, which requires that merely defining a new
quirk for some piece of hardware should not change the behavior of
the driver for that hardware.  In turn, this means that testing
for QUIRK_NONE explicitly is a violation of that implicit contract.

Change a test for QUIRK_NONE and QUIRK_ALIENWARE to default, and
add a test for QUIRK_SBZ to disable the default behavior in that
instance.

Signed-off-by: Alastair Bridgewater <alastair.bridgewater@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_ca0132.c

index 25fccce1eff14603e20281c72cec8dbd7c6db45f..49635d1c9c394a03d34a7e230a11c23bee31adf9 100644 (file)
@@ -7237,8 +7237,9 @@ static int ca0132_init(struct hda_codec *codec)
        case QUIRK_R3DI:
                r3di_setup_defaults(codec);
                break;
-       case QUIRK_NONE:
-       case QUIRK_ALIENWARE:
+       case QUIRK_SBZ:
+               break;
+       default:
                ca0132_setup_defaults(codec);
                ca0132_init_analog_mic2(codec);
                ca0132_init_dmic(codec);