Skip to content

Commit c6cd83c

Browse files
harinworkstiwai
authored andcommitted
ALSA: ctxfi: Rename SPDIFI1 to SPDIFI_BAY
Rename the SPDIFI1 enum value to SPDIFI_BAY to better reflect its purpose as the S/PDIF input on the internal drive bay, as opposed to the S/PDIF input via Flexijack or optical (SPDIFIO; not SPDIFI-zero). Signed-off-by: Harin Lee <me@harin.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/20260401090159.2404387-2-me@harin.net
1 parent 0542972 commit c6cd83c

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

sound/pci/ctxfi/ctatc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,10 +1429,10 @@ static int atc_get_resources(struct ct_atc *atc)
14291429
for (i = 0; i < NUM_DAIOTYP; i++) {
14301430
if (((i == MIC) && !cap.dedicated_mic) ||
14311431
((i == RCA) && !cap.dedicated_rca) ||
1432-
i == SPDIFI1)
1432+
i == SPDIFI_BAY)
14331433
continue;
14341434
if (atc->model == CTSB073X && i == SPDIFIO)
1435-
da_desc.type = SPDIFI1;
1435+
da_desc.type = SPDIFI_BAY;
14361436
else
14371437
da_desc.type = i;
14381438
da_desc.output = (i < LINEIM) || (i == RCA);

sound/pci/ctxfi/ctdaio.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static const struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = {
3535
[LINEIM] = {.left = 0x1b5, .right = 0x1bd},
3636
[SPDIFOO] = {.left = 0x20, .right = 0x21},
3737
[SPDIFIO] = {.left = 0x15, .right = 0x1d},
38-
[SPDIFI1] = {.left = 0x95, .right = 0x9d},
38+
[SPDIFI_BAY] = {.left = 0x95, .right = 0x9d},
3939
};
4040

4141
static const struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = {
@@ -106,7 +106,7 @@ static int daio_device_index(enum DAIOTYP type, struct hw *hw)
106106
switch (type) {
107107
case SPDIFOO: return 0;
108108
case SPDIFIO: return 0;
109-
case SPDIFI1: return 1;
109+
case SPDIFI_BAY: return 1;
110110
case LINEO1: return 4;
111111
case LINEO2: return 7;
112112
case LINEO3: return 5;
@@ -120,7 +120,7 @@ static int daio_device_index(enum DAIOTYP type, struct hw *hw)
120120
switch (type) {
121121
case SPDIFOO: return 0;
122122
case SPDIFIO: return 0;
123-
case SPDIFI1: return 1;
123+
case SPDIFI_BAY: return 1;
124124
case LINEO1: return 4;
125125
case LINEO2: return 7;
126126
case LINEO3: return 5;

sound/pci/ctxfi/ctdaio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ enum DAIOTYP {
3232
SPDIFIO, /* S/PDIF In (Flexijack/Optical) on the card */
3333
MIC, /* Dedicated mic on Titanium HD */
3434
RCA, /* Dedicated RCA on SE-300PCIE */
35-
SPDIFI1, /* S/PDIF In on internal Drive Bay */
35+
SPDIFI_BAY, /* S/PDIF In on internal drive bay */
3636
NUM_DAIOTYP
3737
};
3838

0 commit comments

Comments
 (0)