Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ALSA: ctxfi: Add hw parameter to daio_mgr_dao_init()
Add a hw parameter to the daio_mgr_dao_init() function to provide
access to model-specific information. This is necessary for proper
configuration of S/PDIF and I2S output ports on different hardware
variants.
Signed-off-by: Harin Lee <me@harin.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20251124180501.2760421-2-me@harin.net
authored by
Harin Lee
and committed by
Takashi Iwai
5ebd0542
a748e1db
+4
-4
+1
-1
sound/pci/ctxfi/ctdaio.c
+1
-1
sound/pci/ctxfi/ctdaio.c
···
390
390
hw->daio_mgr_commit_write(hw, mgr->mgr.ctrl_blk);
391
391
392
392
conf = (desc->msr & 0x7) | (desc->passthru << 3);
393
-
hw->daio_mgr_dao_init(mgr->mgr.ctrl_blk,
393
+
hw->daio_mgr_dao_init(hw, mgr->mgr.ctrl_blk,
394
394
daio_device_index(dao->daio.type, hw), conf);
395
395
hw->daio_mgr_enb_dao(mgr->mgr.ctrl_blk,
396
396
daio_device_index(dao->daio.type, hw));
+1
-1
sound/pci/ctxfi/cthardware.h
+1
-1
sound/pci/ctxfi/cthardware.h
···
167
167
int (*daio_mgr_dsb_dai)(void *blk, unsigned int idx);
168
168
int (*daio_mgr_enb_dao)(void *blk, unsigned int idx);
169
169
int (*daio_mgr_dsb_dao)(void *blk, unsigned int idx);
170
-
int (*daio_mgr_dao_init)(void *blk, unsigned int idx,
170
+
int (*daio_mgr_dao_init)(struct hw *hw, void *blk, unsigned int idx,
171
171
unsigned int conf);
172
172
int (*daio_mgr_set_imaparc)(void *blk, unsigned int slot);
173
173
int (*daio_mgr_set_imapnxt)(void *blk, unsigned int next);
+1
-1
sound/pci/ctxfi/cthw20k1.c
+1
-1
sound/pci/ctxfi/cthw20k1.c
···
1031
1031
return 0;
1032
1032
}
1033
1033
1034
-
static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)
1034
+
static int daio_mgr_dao_init(struct hw *hw __maybe_unused, void *blk, unsigned int idx, unsigned int conf)
1035
1035
{
1036
1036
struct daio_mgr_ctrl_blk *ctl = blk;
1037
1037
+1
-1
sound/pci/ctxfi/cthw20k2.c
+1
-1
sound/pci/ctxfi/cthw20k2.c