1 files changed, 21 insertions, 21 deletions

diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index 84f86bf63b8f..c1c3f8816fff 100644
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -140,19 +140,19 @@ static int dao_rsc_reinit(struct dao *dao, const struct dao_desc *desc);
 
 static int dao_spdif_get_spos(struct dao *dao, unsigned int *spos)
 {
-        ((struct hw *)dao->hw)->dao_get_spos(dao->ctrl_blk, spos);
+        dao->hw->dao_get_spos(dao->ctrl_blk, spos);
         return 0;
 }
 
 static int dao_spdif_set_spos(struct dao *dao, unsigned int spos)
 {
-        ((struct hw *)dao->hw)->dao_set_spos(dao->ctrl_blk, spos);
+        dao->hw->dao_set_spos(dao->ctrl_blk, spos);
         return 0;
 }
 
 static int dao_commit_write(struct dao *dao)
 {
-        ((struct hw *)dao->hw)->dao_commit_write(dao->hw,
+        dao->hw->dao_commit_write(dao->hw,
                 daio_device_index(dao->daio.type, dao->hw), dao->ctrl_blk);
         return 0;
 }
@@ -277,16 +277,14 @@ static struct dao_rsc_ops dao_ops = {
 static int dai_set_srt_srcl(struct dai *dai, struct rsc *src)
 {
         src->ops->master(src);
-        ((struct hw *)dai->hw)->dai_srt_set_srcm(dai->ctrl_blk,
-                                                src->ops->index(src));
+        dai->hw->dai_srt_set_srcm(dai->ctrl_blk, src->ops->index(src));
         return 0;
 }
 
 static int dai_set_srt_srcr(struct dai *dai, struct rsc *src)
 {
         src->ops->master(src);
-        ((struct hw *)dai->hw)->dai_srt_set_srco(dai->ctrl_blk,
-                                                src->ops->index(src));
+        dai->hw->dai_srt_set_srco(dai->ctrl_blk, src->ops->index(src));
         return 0;
 }
 
@@ -297,25 +295,25 @@ static int dai_set_srt_msr(struct dai *dai, unsigned int msr)
         for (rsr = 0; msr > 1; msr >>= 1)
                 rsr++;
 
-        ((struct hw *)dai->hw)->dai_srt_set_rsr(dai->ctrl_blk, rsr);
+        dai->hw->dai_srt_set_rsr(dai->ctrl_blk, rsr);
         return 0;
 }
 
 static int dai_set_enb_src(struct dai *dai, unsigned int enb)
 {
-        ((struct hw *)dai->hw)->dai_srt_set_ec(dai->ctrl_blk, enb);
+        dai->hw->dai_srt_set_ec(dai->ctrl_blk, enb);
         return 0;
 }
 
 static int dai_set_enb_srt(struct dai *dai, unsigned int enb)
 {
-        ((struct hw *)dai->hw)->dai_srt_set_et(dai->ctrl_blk, enb);
+        dai->hw->dai_srt_set_et(dai->ctrl_blk, enb);
         return 0;
 }
 
 static int dai_commit_write(struct dai *dai)
 {
-        ((struct hw *)dai->hw)->dai_commit_write(dai->hw,
+        dai->hw->dai_commit_write(dai->hw,
                 daio_device_index(dai->daio.type, dai->hw), dai->ctrl_blk);
         return 0;
 }
@@ -331,12 +329,12 @@ static struct dai_rsc_ops dai_ops = {
 
 static int daio_rsc_init(struct daio *daio,
                          const struct daio_desc *desc,
-                         void *hw)
+                         struct hw *hw)
 {
         int err;
         unsigned int idx_l, idx_r;
 
-        switch (((struct hw *)hw)->chip_type) {
+        switch (hw->chip_type) {
         case ATC20K1:
                 idx_l = idx_20k1[desc->type].left;
                 idx_r = idx_20k1[desc->type].right;
@@ -360,7 +358,7 @@ static int daio_rsc_init(struct daio *daio,
         if (desc->type <= DAIO_OUT_MAX) {
                 daio->rscl.ops = daio->rscr.ops = &daio_out_rsc_ops;
         } else {
-                switch (((struct hw *)hw)->chip_type) {
+                switch (hw->chip_type) {
                 case ATC20K1:
                         daio->rscl.ops = daio->rscr.ops = &daio_in_rsc_ops_20k1;
                         break;
@@ -445,7 +443,7 @@ static int dao_rsc_uninit(struct dao *dao)
                 kfree(dao->imappers);
                 dao->imappers = NULL;
         }
-        ((struct hw *)dao->hw)->dao_put_ctrl_blk(dao->ctrl_blk);
+        dao->hw->dao_put_ctrl_blk(dao->ctrl_blk);
         dao->hw = dao->ctrl_blk = NULL;
         daio_rsc_uninit(&dao->daio);
 
@@ -502,7 +500,7 @@ error1:
 
 static int dai_rsc_uninit(struct dai *dai)
 {
-        ((struct hw *)dai->hw)->dai_put_ctrl_blk(dai->ctrl_blk);
+        dai->hw->dai_put_ctrl_blk(dai->ctrl_blk);
         dai->hw = dai->ctrl_blk = NULL;
         daio_rsc_uninit(&dai->daio);
         return 0;
@@ -541,7 +539,8 @@ static int get_daio_rsc(struct daio_mgr *mgr,
         err = daio_mgr_get_rsc(&mgr->mgr, desc->type);
         spin_unlock_irqrestore(&mgr->mgr_lock, flags);
         if (err) {
-                printk(KERN_ERR "Can't meet DAIO resource request!\n");
+                dev_err(mgr->card->dev,
+                        "Can't meet DAIO resource request!\n");
                 return err;
         }
 
@@ -692,7 +691,7 @@ static int daio_mgr_commit_write(struct daio_mgr *mgr)
         return 0;
 }
 
-int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr)
+int daio_mgr_create(struct hw *hw, struct daio_mgr **rdaio_mgr)
 {
         int err, i;
         struct daio_mgr *daio_mgr;
@@ -727,12 +726,13 @@ int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr)
         daio_mgr->imap_add = daio_imap_add;
         daio_mgr->imap_delete = daio_imap_delete;
         daio_mgr->commit_write = daio_mgr_commit_write;
+        daio_mgr->card = hw->card;
 
         for (i = 0; i < 8; i++) {
-                ((struct hw *)hw)->daio_mgr_dsb_dao(daio_mgr->mgr.ctrl_blk, i);
-                ((struct hw *)hw)->daio_mgr_dsb_dai(daio_mgr->mgr.ctrl_blk, i);
+                hw->daio_mgr_dsb_dao(daio_mgr->mgr.ctrl_blk, i);
+                hw->daio_mgr_dsb_dai(daio_mgr->mgr.ctrl_blk, i);
         }
-        ((struct hw *)hw)->daio_mgr_commit_write(hw, daio_mgr->mgr.ctrl_blk);
+        hw->daio_mgr_commit_write(hw, daio_mgr->mgr.ctrl_blk);
 
         *rdaio_mgr = daio_mgr;