diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2014-09-29 05:03:24 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-30 04:36:12 -0400 |
commit | e5347f9ab7cdafc2dbc0d4f7f30204293be71d8e (patch) | |
tree | 9608f5ef7fc971ed7d994dbf21bf4ece5f089868 | |
parent | 3d0fdc86e4b500dfcfbf2f68039d2d6853536c2e (diff) |
ALSA: ctxfi: initialized snd_card
initialized the reference of snd_card which was added to the various
structures through the previous patch of the series.
these references of snd_card will be used in a later patch to convert
the pr_* macros to dev_*
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/ctxfi/ctamixer.c | 2 | ||||
-rw-r--r-- | sound/pci/ctxfi/ctatc.c | 1 | ||||
-rw-r--r-- | sound/pci/ctxfi/ctdaio.c | 1 | ||||
-rw-r--r-- | sound/pci/ctxfi/ctsrc.c | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c index 4671cbe7b397..4d389c330978 100644 --- a/sound/pci/ctxfi/ctamixer.c +++ b/sound/pci/ctxfi/ctamixer.c | |||
@@ -314,6 +314,7 @@ int amixer_mgr_create(struct hw *hw, struct amixer_mgr **ramixer_mgr) | |||
314 | 314 | ||
315 | amixer_mgr->get_amixer = get_amixer_rsc; | 315 | amixer_mgr->get_amixer = get_amixer_rsc; |
316 | amixer_mgr->put_amixer = put_amixer_rsc; | 316 | amixer_mgr->put_amixer = put_amixer_rsc; |
317 | amixer_mgr->card = hw->card; | ||
317 | 318 | ||
318 | *ramixer_mgr = amixer_mgr; | 319 | *ramixer_mgr = amixer_mgr; |
319 | 320 | ||
@@ -467,6 +468,7 @@ int sum_mgr_create(struct hw *hw, struct sum_mgr **rsum_mgr) | |||
467 | 468 | ||
468 | sum_mgr->get_sum = get_sum_rsc; | 469 | sum_mgr->get_sum = get_sum_rsc; |
469 | sum_mgr->put_sum = put_sum_rsc; | 470 | sum_mgr->put_sum = put_sum_rsc; |
471 | sum_mgr->card = hw->card; | ||
470 | 472 | ||
471 | *rsum_mgr = sum_mgr; | 473 | *rsum_mgr = sum_mgr; |
472 | 474 | ||
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index e536ab97ddeb..5cc8c3860b11 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c | |||
@@ -1333,6 +1333,7 @@ static int atc_create_hw_devs(struct ct_atc *atc) | |||
1333 | pr_err("Failed to create hw obj!!!\n"); | 1333 | pr_err("Failed to create hw obj!!!\n"); |
1334 | return err; | 1334 | return err; |
1335 | } | 1335 | } |
1336 | hw->card = atc->card; | ||
1336 | atc->hw = hw; | 1337 | atc->hw = hw; |
1337 | 1338 | ||
1338 | /* Initialize card hardware. */ | 1339 | /* Initialize card hardware. */ |
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index aa4aa712c285..212280e11f6e 100644 --- a/sound/pci/ctxfi/ctdaio.c +++ b/sound/pci/ctxfi/ctdaio.c | |||
@@ -725,6 +725,7 @@ int daio_mgr_create(struct hw *hw, struct daio_mgr **rdaio_mgr) | |||
725 | daio_mgr->imap_add = daio_imap_add; | 725 | daio_mgr->imap_add = daio_imap_add; |
726 | daio_mgr->imap_delete = daio_imap_delete; | 726 | daio_mgr->imap_delete = daio_imap_delete; |
727 | daio_mgr->commit_write = daio_mgr_commit_write; | 727 | daio_mgr->commit_write = daio_mgr_commit_write; |
728 | daio_mgr->card = hw->card; | ||
728 | 729 | ||
729 | for (i = 0; i < 8; i++) { | 730 | for (i = 0; i < 8; i++) { |
730 | hw->daio_mgr_dsb_dao(daio_mgr->mgr.ctrl_blk, i); | 731 | hw->daio_mgr_dsb_dao(daio_mgr->mgr.ctrl_blk, i); |
diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c index d3ef213fad77..50fa35bc66d2 100644 --- a/sound/pci/ctxfi/ctsrc.c +++ b/sound/pci/ctxfi/ctsrc.c | |||
@@ -566,6 +566,7 @@ int src_mgr_create(struct hw *hw, struct src_mgr **rsrc_mgr) | |||
566 | src_mgr->src_enable = src_enable; | 566 | src_mgr->src_enable = src_enable; |
567 | src_mgr->src_disable = src_disable; | 567 | src_mgr->src_disable = src_disable; |
568 | src_mgr->commit_write = src_mgr_commit_write; | 568 | src_mgr->commit_write = src_mgr_commit_write; |
569 | src_mgr->card = hw->card; | ||
569 | 570 | ||
570 | /* Disable all SRC resources. */ | 571 | /* Disable all SRC resources. */ |
571 | for (i = 0; i < 256; i++) | 572 | for (i = 0; i < 256; i++) |
@@ -857,6 +858,7 @@ int srcimp_mgr_create(struct hw *hw, struct srcimp_mgr **rsrcimp_mgr) | |||
857 | srcimp_mgr->put_srcimp = put_srcimp_rsc; | 858 | srcimp_mgr->put_srcimp = put_srcimp_rsc; |
858 | srcimp_mgr->imap_add = srcimp_imap_add; | 859 | srcimp_mgr->imap_add = srcimp_imap_add; |
859 | srcimp_mgr->imap_delete = srcimp_imap_delete; | 860 | srcimp_mgr->imap_delete = srcimp_imap_delete; |
861 | srcimp_mgr->card = hw->card; | ||
860 | 862 | ||
861 | *rsrcimp_mgr = srcimp_mgr; | 863 | *rsrcimp_mgr = srcimp_mgr; |
862 | 864 | ||