| Message ID | 1410790181-16457-1-git-send-email-sudipm.mukherjee@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Takashi Iwai |
| Headers | show |
At Mon, 15 Sep 2014 19:39:41 +0530, Sudip Mukherjee wrote: > > pr_* macros replaced with dev_* as they are more preffered over pr_*. > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> > --- > > in v1 Takashi mentioned that now we have card->dev > so v2 is using card->dev as much as possible. > > sound/pci/ctxfi/ctatc.c | 24 ++++++++++++++---------- > sound/pci/ctxfi/cthw20k1.c | 15 +++++++++------ > sound/pci/ctxfi/cthw20k2.c | 22 ++++++++++++++-------- > sound/pci/ctxfi/ctmixer.c | 6 ++++-- > sound/pci/ctxfi/ctpcm.c | 9 ++++++--- > sound/pci/ctxfi/ctresource.c | 20 +++++++++++++------- > sound/pci/ctxfi/xfi.c | 15 +++++++++------ > 7 files changed, 69 insertions(+), 42 deletions(-) > > diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c > index d92a08c..a786bc1 100644 > --- a/sound/pci/ctxfi/ctatc.c > +++ b/sound/pci/ctxfi/ctatc.c > @@ -1282,8 +1282,8 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid) > p = snd_pci_quirk_lookup_id(vendor_id, device_id, list); > if (p) { > if (p->value < 0) { > - pr_err("ctxfi: Device %04x:%04x is black-listed\n", > - vendor_id, device_id); > + dev_err(atc->card->dev, "ctxfi: Device %04x:%04x is black-listed\n", > + vendor_id, device_id); You need no prefix for dev_xxx(). > diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c > index e49d2be..80beecb 100644 > --- a/sound/pci/ctxfi/ctresource.c > +++ b/sound/pci/ctxfi/ctresource.c (snip) > @@ -282,8 +287,9 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr) > case SUM: > break; > default: > - pr_err("ctxfi: Invalid resource type value %d!\n", > - mgr->type); > + dev_err(&(((struct hw *)mgr->hw)->pci->dev), > + "ctxfi: Invalid resource type value %d!\n", > + mgr->type); Did you really conclude that this is the best way? Also, is it good to mix up the usages of both card->dev and &pci->dev? Think again. thanks, Takashi
On Mon, 2014-09-15 at 19:39 +0530, Sudip Mukherjee wrote: > pr_* macros replaced with dev_* as they are more preffered over pr_*. [] > diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c [] > @@ -1282,8 +1282,8 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid) > p = snd_pci_quirk_lookup_id(vendor_id, device_id, list); > if (p) { > if (p->value < 0) { > - pr_err("ctxfi: Device %04x:%04x is black-listed\n", > - vendor_id, device_id); > + dev_err(atc->card->dev, "ctxfi: Device %04x:%04x is black-listed\n", > + vendor_id, device_id); You should probably remove the "ctxfi: " from the dev_<level> uses as the card->dev name is emitted by dev_err dev_err(atc->card->dev, "Device %04x:%04x is black-listed\n", vendor_id, device_id); etc...
On Mon, Sep 15, 2014 at 04:29:48PM +0200, Takashi Iwai wrote: > At Mon, 15 Sep 2014 19:39:41 +0530, > Sudip Mukherjee wrote: > > > > pr_* macros replaced with dev_* as they are more preffered over pr_*. > > > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> > > --- > > > > in v1 Takashi mentioned that now we have card->dev > > so v2 is using card->dev as much as possible. > > > > sound/pci/ctxfi/ctatc.c | 24 ++++++++++++++---------- > > sound/pci/ctxfi/cthw20k1.c | 15 +++++++++------ > > sound/pci/ctxfi/cthw20k2.c | 22 ++++++++++++++-------- > > sound/pci/ctxfi/ctmixer.c | 6 ++++-- > > sound/pci/ctxfi/ctpcm.c | 9 ++++++--- > > sound/pci/ctxfi/ctresource.c | 20 +++++++++++++------- > > sound/pci/ctxfi/xfi.c | 15 +++++++++------ > > 7 files changed, 69 insertions(+), 42 deletions(-) > > > > diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c > > index d92a08c..a786bc1 100644 > > --- a/sound/pci/ctxfi/ctatc.c > > +++ b/sound/pci/ctxfi/ctatc.c > > @@ -1282,8 +1282,8 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid) > > p = snd_pci_quirk_lookup_id(vendor_id, device_id, list); > > if (p) { > > if (p->value < 0) { > > - pr_err("ctxfi: Device %04x:%04x is black-listed\n", > > - vendor_id, device_id); > > + dev_err(atc->card->dev, "ctxfi: Device %04x:%04x is black-listed\n", > > + vendor_id, device_id); > > You need no prefix for dev_xxx(). > i was also thinking that . :) > > diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c > > index e49d2be..80beecb 100644 > > --- a/sound/pci/ctxfi/ctresource.c > > +++ b/sound/pci/ctxfi/ctresource.c > (snip) > > @@ -282,8 +287,9 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr) > > case SUM: > > break; > > default: > > - pr_err("ctxfi: Invalid resource type value %d!\n", > > - mgr->type); > > + dev_err(&(((struct hw *)mgr->hw)->pci->dev), > > + "ctxfi: Invalid resource type value %d!\n", > > + mgr->type); > > Did you really conclude that this is the best way? > Also, is it good to mix up the usages of both card->dev and &pci->dev? > Think again. > i have a doubt regarding this :- in the snd_card_new() card->dev is being assigned with &pci->dev , then are not they the same ? i was trying to get some way of finding out the reference of card->dev from the resource manager , but ... :( i will try again and if i cant find any way i will ask for some hint from you. i am still a newbie , and started this pr_* to dev_* on your inspiration , and i hope you will not be irritated by my patches . :) thanks sudip > > thanks, > > Takashi
At Mon, 15 Sep 2014 20:55:54 +0530, Sudip Mukherjee wrote: > > On Mon, Sep 15, 2014 at 04:29:48PM +0200, Takashi Iwai wrote: > > At Mon, 15 Sep 2014 19:39:41 +0530, > > Sudip Mukherjee wrote: > > > > > > pr_* macros replaced with dev_* as they are more preffered over pr_*. > > > > > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> > > > --- > > > > > > in v1 Takashi mentioned that now we have card->dev > > > so v2 is using card->dev as much as possible. > > > > > > sound/pci/ctxfi/ctatc.c | 24 ++++++++++++++---------- > > > sound/pci/ctxfi/cthw20k1.c | 15 +++++++++------ > > > sound/pci/ctxfi/cthw20k2.c | 22 ++++++++++++++-------- > > > sound/pci/ctxfi/ctmixer.c | 6 ++++-- > > > sound/pci/ctxfi/ctpcm.c | 9 ++++++--- > > > sound/pci/ctxfi/ctresource.c | 20 +++++++++++++------- > > > sound/pci/ctxfi/xfi.c | 15 +++++++++------ > > > 7 files changed, 69 insertions(+), 42 deletions(-) > > > > > > diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c > > > index d92a08c..a786bc1 100644 > > > --- a/sound/pci/ctxfi/ctatc.c > > > +++ b/sound/pci/ctxfi/ctatc.c > > > @@ -1282,8 +1282,8 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid) > > > p = snd_pci_quirk_lookup_id(vendor_id, device_id, list); > > > if (p) { > > > if (p->value < 0) { > > > - pr_err("ctxfi: Device %04x:%04x is black-listed\n", > > > - vendor_id, device_id); > > > + dev_err(atc->card->dev, "ctxfi: Device %04x:%04x is black-listed\n", > > > + vendor_id, device_id); > > > > You need no prefix for dev_xxx(). > > > i was also thinking that . :) > > > diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c > > > index e49d2be..80beecb 100644 > > > --- a/sound/pci/ctxfi/ctresource.c > > > +++ b/sound/pci/ctxfi/ctresource.c > > (snip) > > > @@ -282,8 +287,9 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr) > > > case SUM: > > > break; > > > default: > > > - pr_err("ctxfi: Invalid resource type value %d!\n", > > > - mgr->type); > > > + dev_err(&(((struct hw *)mgr->hw)->pci->dev), > > > + "ctxfi: Invalid resource type value %d!\n", > > > + mgr->type); > > > > Did you really conclude that this is the best way? > > Also, is it good to mix up the usages of both card->dev and &pci->dev? > > Think again. > > > > i have a doubt regarding this :- > in the snd_card_new() card->dev is being assigned with &pci->dev , > then are not they the same ? Yes, but how can it be guaranteed in future? We may avoid the problems in future by keeping the consistency at this moment. It's one of the good points of keeping code consistent, in addition to: increased readability / understandability and making the bug easier to be spotted. > i was trying to get some way of finding out the reference of card->dev from the resource manager , > but ... :( > i will try again and if i cant find any way i will ask for some hint from you. Good! A hint is that there is no 100% perfect way to achieve this. It's always compromise, and you'll have to choose which one is better than others. For that, you'll have to evaluate multiple implementations, and it's a really good exercise for coding. > i am still a newbie , and started this pr_* to dev_* on your inspiration , and i hope > you will not be irritated by my patches . :) No problem. I left these driver codes just because of laziness, as I knew to work more on the code than the simple scripting :) Takashi
On Mon, Sep 15, 2014 at 08:17:52PM +0200, Takashi Iwai wrote: > At Mon, 15 Sep 2014 20:55:54 +0530, > Sudip Mukherjee wrote: > > > > On Mon, Sep 15, 2014 at 04:29:48PM +0200, Takashi Iwai wrote: > > > At Mon, 15 Sep 2014 19:39:41 +0530, > > > Sudip Mukherjee wrote: <snip> > > > > > > > > diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c > > > > index e49d2be..80beecb 100644 > > > > --- a/sound/pci/ctxfi/ctresource.c > > > > +++ b/sound/pci/ctxfi/ctresource.c > > > (snip) > > > > @@ -282,8 +287,9 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr) > > > > case SUM: > > > > break; > > > > default: > > > > - pr_err("ctxfi: Invalid resource type value %d!\n", > > > > - mgr->type); > > > > + dev_err(&(((struct hw *)mgr->hw)->pci->dev), > > > > + "ctxfi: Invalid resource type value %d!\n", > > > > + mgr->type); > > > > > > Did you really conclude that this is the best way? > > > Also, is it good to mix up the usages of both card->dev and &pci->dev? > > > Think again. > > > > > > > i have a doubt regarding this :- > > in the snd_card_new() card->dev is being assigned with &pci->dev , > > then are not they the same ? > > Yes, but how can it be guaranteed in future? We may avoid the > problems in future by keeping the consistency at this moment. It's > one of the good points of keeping code consistent, in addition to: > increased readability / understandability and making the bug easier to > be spotted. understood the point. > > > i was trying to get some way of finding out the reference of card->dev from the resource manager , > > but ... :( > > i will try again and if i cant find any way i will ask for some hint from you. > > Good! A hint is that there is no 100% perfect way to achieve this. > It's always compromise, and you'll have to choose which one is better > than others. For that, you'll have to evaluate multiple > implementations, and it's a really good exercise for coding. > i can find the rsc_mgr from the snd_card or ct_atc but if i want to find the reference to the device from the managers , then either i can go with 1) &(((struct hw *)mgr->hw)->pci->dev) or 2) use pci_get_drvdata with ((struct hw *)mgr->hw)->pci or 3) using container_of with &(((struct hw *)mgr->hw)->pci->dev) to find the pointer to snd_card via card_dev , but it becomes too complicated :( we can get to all the managers (rsc_mgr, amixer_mgr, src_mgr ...) using atc->rsc_mgrs[] , then there should be some simple way to go the opposite way (reaching atc from the managers) . container_of will not work .. :( or am i missing something?? thanks sudip > > i am still a newbie , and started this pr_* to dev_* on your inspiration , and i hope > > you will not be irritated by my patches . :) > > No problem. I left these driver codes just because of laziness, as I > knew to work more on the code than the simple scripting :) > > > Takashi
At Thu, 18 Sep 2014 14:51:26 +0530, Sudip Mukherjee wrote: > > On Mon, Sep 15, 2014 at 08:17:52PM +0200, Takashi Iwai wrote: > > At Mon, 15 Sep 2014 20:55:54 +0530, > > Sudip Mukherjee wrote: > > > > > > On Mon, Sep 15, 2014 at 04:29:48PM +0200, Takashi Iwai wrote: > > > > At Mon, 15 Sep 2014 19:39:41 +0530, > > > > Sudip Mukherjee wrote: > <snip> > > > > > > > > > > diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c > > > > > index e49d2be..80beecb 100644 > > > > > --- a/sound/pci/ctxfi/ctresource.c > > > > > +++ b/sound/pci/ctxfi/ctresource.c > > > > (snip) > > > > > @@ -282,8 +287,9 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr) > > > > > case SUM: > > > > > break; > > > > > default: > > > > > - pr_err("ctxfi: Invalid resource type value %d!\n", > > > > > - mgr->type); > > > > > + dev_err(&(((struct hw *)mgr->hw)->pci->dev), > > > > > + "ctxfi: Invalid resource type value %d!\n", > > > > > + mgr->type); > > > > > > > > Did you really conclude that this is the best way? > > > > Also, is it good to mix up the usages of both card->dev and &pci->dev? > > > > Think again. > > > > > > > > > > i have a doubt regarding this :- > > > in the snd_card_new() card->dev is being assigned with &pci->dev , > > > then are not they the same ? > > > > Yes, but how can it be guaranteed in future? We may avoid the > > problems in future by keeping the consistency at this moment. It's > > one of the good points of keeping code consistent, in addition to: > > increased readability / understandability and making the bug easier to > > be spotted. > > understood the point. > > > > > i was trying to get some way of finding out the reference of card->dev from the resource manager , > > > but ... :( > > > i will try again and if i cant find any way i will ask for some hint from you. > > > > Good! A hint is that there is no 100% perfect way to achieve this. > > It's always compromise, and you'll have to choose which one is better > > than others. For that, you'll have to evaluate multiple > > implementations, and it's a really good exercise for coding. > > > > i can find the rsc_mgr from the snd_card or ct_atc > but if i want to find the reference to the device from the managers , then > either i can go with > 1) &(((struct hw *)mgr->hw)->pci->dev) > or > 2) use pci_get_drvdata with ((struct hw *)mgr->hw)->pci > or > 3) using container_of with &(((struct hw *)mgr->hw)->pci->dev) to find the pointer to snd_card via card_dev , but it becomes too complicated :( > > we can get to all the managers (rsc_mgr, amixer_mgr, src_mgr ...) using atc->rsc_mgrs[] , then there should be some simple way to go > the opposite way (reaching atc from the managers) . container_of will not work .. :( > or am i missing something?? Adding a new field pointing to card to each struct. Takashi
On Thu, Sep 18, 2014 at 12:21:20PM +0200, Takashi Iwai wrote: > At Thu, 18 Sep 2014 14:51:26 +0530, > Sudip Mukherjee wrote: > > > > On Mon, Sep 15, 2014 at 08:17:52PM +0200, Takashi Iwai wrote: > > > At Mon, 15 Sep 2014 20:55:54 +0530, > > > Sudip Mukherjee wrote: > > > > > > > > On Mon, Sep 15, 2014 at 04:29:48PM +0200, Takashi Iwai wrote: > > > > > At Mon, 15 Sep 2014 19:39:41 +0530, > > > > > Sudip Mukherjee wrote: > > <snip> > > > > > > > > > > > > diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c > > > > > > index e49d2be..80beecb 100644 > > > > > > --- a/sound/pci/ctxfi/ctresource.c > > > > > > +++ b/sound/pci/ctxfi/ctresource.c > > > > > (snip) > > > > > > @@ -282,8 +287,9 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr) > > > > > > case SUM: > > > > > > break; > > > > > > default: > > > > > > - pr_err("ctxfi: Invalid resource type value %d!\n", > > > > > > - mgr->type); > > > > > > + dev_err(&(((struct hw *)mgr->hw)->pci->dev), > > > > > > + "ctxfi: Invalid resource type value %d!\n", > > > > > > + mgr->type); > > > > > > > > > > Did you really conclude that this is the best way? > > > > > Also, is it good to mix up the usages of both card->dev and &pci->dev? > > > > > Think again. > > > > > > > > > > > > > i have a doubt regarding this :- > > > > in the snd_card_new() card->dev is being assigned with &pci->dev , > > > > then are not they the same ? > > > > > > Yes, but how can it be guaranteed in future? We may avoid the > > > problems in future by keeping the consistency at this moment. It's > > > one of the good points of keeping code consistent, in addition to: > > > increased readability / understandability and making the bug easier to > > > be spotted. > > > > understood the point. > > > > > > > i was trying to get some way of finding out the reference of card->dev from the resource manager , > > > > but ... :( > > > > i will try again and if i cant find any way i will ask for some hint from you. > > > > > > Good! A hint is that there is no 100% perfect way to achieve this. > > > It's always compromise, and you'll have to choose which one is better > > > than others. For that, you'll have to evaluate multiple > > > implementations, and it's a really good exercise for coding. > > > > > > > i can find the rsc_mgr from the snd_card or ct_atc > > but if i want to find the reference to the device from the managers , then > > either i can go with > > 1) &(((struct hw *)mgr->hw)->pci->dev) > > or > > 2) use pci_get_drvdata with ((struct hw *)mgr->hw)->pci > > or > > 3) using container_of with &(((struct hw *)mgr->hw)->pci->dev) to find the pointer to snd_card via card_dev , but it becomes too complicated :( > > > > we can get to all the managers (rsc_mgr, amixer_mgr, src_mgr ...) using atc->rsc_mgrs[] , then there should be some simple way to go > > the opposite way (reaching atc from the managers) . container_of will not work .. :( > > or am i missing something?? > > Adding a new field pointing to card to each struct. i seriously did not think of that , i was under the impression that a newbie is not supposed to change or add to the designs. anyways, i feel that i understand the code a little better than what i understood at the the time of my first patch. and definitely your "writing-an-alsa-driver" has helped a lot . thanks sudip > > > Takashi
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index d92a08c..a786bc1 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -1282,8 +1282,8 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid) p = snd_pci_quirk_lookup_id(vendor_id, device_id, list); if (p) { if (p->value < 0) { - pr_err("ctxfi: Device %04x:%04x is black-listed\n", - vendor_id, device_id); + dev_err(atc->card->dev, "ctxfi: Device %04x:%04x is black-listed\n", + vendor_id, device_id); return -ENOENT; } atc->model = p->value; @@ -1314,7 +1314,8 @@ int ct_atc_create_alsa_devs(struct ct_atc *atc) err = alsa_dev_funcs[i].create(atc, i, alsa_dev_funcs[i].public_name); if (err) { - pr_err("ctxfi: Creating alsa device %d failed!\n", i); + dev_err(atc->card->dev, + "ctxfi: Creating alsa device %d failed!\n", i); return err; } } @@ -1330,7 +1331,7 @@ static int atc_create_hw_devs(struct ct_atc *atc) err = create_hw_obj(atc->pci, atc->chip_type, atc->model, &hw); if (err) { - pr_err("Failed to create hw obj!!!\n"); + dev_err(atc->card->dev, "Failed to create hw obj!!!\n"); return err; } atc->hw = hw; @@ -1349,7 +1350,8 @@ static int atc_create_hw_devs(struct ct_atc *atc) err = rsc_mgr_funcs[i].create(atc->hw, &atc->rsc_mgrs[i]); if (err) { - pr_err("ctxfi: Failed to create rsc_mgr %d!!!\n", i); + dev_err(atc->card->dev, + "ctxfi: Failed to create rsc_mgr %d!!!\n", i); return err; } } @@ -1396,7 +1398,8 @@ static int atc_get_resources(struct ct_atc *atc) err = daio_mgr->get_daio(daio_mgr, &da_desc, (struct daio **)&atc->daios[i]); if (err) { - pr_err("ctxfi: Failed to get DAIO resource %d!!!\n", + dev_err(atc->card->dev, + "ctxfi: Failed to get DAIO resource %d!!!\n", i); return err; } @@ -1600,7 +1603,8 @@ static int atc_resume(struct ct_atc *atc) /* Do hardware resume. */ err = atc_hw_resume(atc); if (err < 0) { - pr_err("ctxfi: pci_enable_device failed, disabling device\n"); + dev_err(atc->card->dev, + "ctxfi: pci_enable_device failed, disabling device\n"); snd_card_disconnect(atc->card); return err; } @@ -1697,7 +1701,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, /* Find card model */ err = atc_identify_card(atc, ssid); if (err < 0) { - pr_err("ctatc: Card not recognised\n"); + dev_err(card->dev, "ctatc: Card not recognised\n"); goto error1; } @@ -1713,7 +1717,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, err = ct_mixer_create(atc, (struct ct_mixer **)&atc->mixer); if (err) { - pr_err("ctxfi: Failed to create mixer obj!!!\n"); + dev_err(card->dev, "ctxfi: Failed to create mixer obj!!!\n"); goto error1; } @@ -1740,6 +1744,6 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, error1: ct_atc_destroy(atc); - pr_err("ctxfi: Something wrong!!!\n"); + dev_err(card->dev, "ctxfi: Something wrong!!!\n"); return err; } diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c index 71d496f..1cedfe4 100644 --- a/sound/pci/ctxfi/cthw20k1.c +++ b/sound/pci/ctxfi/cthw20k1.c @@ -1268,7 +1268,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info) /* Set up device page table */ if ((~0UL) == info->vm_pgt_phys) { - pr_err("Wrong device page table page address!\n"); + dev_err(&hw->pci->dev, + "Wrong device page table page address!\n"); return -1; } @@ -1327,7 +1328,7 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr) mdelay(40); } if (i >= 3) { - pr_alert("PLL initialization failed!!!\n"); + dev_alert(&hw->pci->dev, "PLL initialization failed!!!\n"); return -EBUSY; } @@ -1351,7 +1352,7 @@ static int hw_auto_init(struct hw *hw) break; } if (!get_field(gctl, GCTL_AID)) { - pr_alert("Card Auto-init failed!!!\n"); + dev_alert(&hw->pci->dev, "Card Auto-init failed!!!\n"); return -EBUSY; } @@ -1911,8 +1912,9 @@ static int hw_card_start(struct hw *hw) /* Set DMA transfer mask */ if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { - pr_err("architecture does not support PCI busmaster DMA with mask 0x%llx\n", - CT_XFI_DMA_MASK); + dev_err(&pci->dev, + "architecture does not support PCI busmaster DMA with mask 0x%llx\n", + CT_XFI_DMA_MASK); err = -ENXIO; goto error1; } @@ -1941,7 +1943,8 @@ static int hw_card_start(struct hw *hw) err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED, KBUILD_MODNAME, hw); if (err < 0) { - pr_err("XFi: Cannot get irq %d\n", pci->irq); + dev_err(&pci->dev, + "XFi: Cannot get irq %d\n", pci->irq); goto error2; } hw->irq = pci->irq; diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c index df2d8c5..e67e637 100644 --- a/sound/pci/ctxfi/cthw20k2.c +++ b/sound/pci/ctxfi/cthw20k2.c @@ -1187,7 +1187,8 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info) hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121); hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0); } else { - pr_alert("ctxfi: ERROR!!! Invalid sampling rate!!!\n"); + dev_alert(&hw->pci->dev, + "ctxfi: ERROR!!! Invalid sampling rate!!!\n"); return -EINVAL; } @@ -1246,7 +1247,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info) /* Set up device page table */ if ((~0UL) == info->vm_pgt_phys) { - pr_alert("ctxfi: Wrong device page table page address!!!\n"); + dev_alert(&hw->pci->dev, + "ctxfi: Wrong device page table page address!!!\n"); return -1; } @@ -1351,7 +1353,8 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr) break; } if (i >= 1000) { - pr_alert("ctxfi: PLL initialization failed!!!\n"); + dev_alert(&hw->pci->dev, + "ctxfi: PLL initialization failed!!!\n"); return -EBUSY; } @@ -1375,7 +1378,7 @@ static int hw_auto_init(struct hw *hw) break; } if (!get_field(gctl, GCTL_AID)) { - pr_alert("ctxfi: Card Auto-init failed!!!\n"); + dev_alert(&hw->pci->dev, "ctxfi: Card Auto-init failed!!!\n"); return -EBUSY; } @@ -1846,7 +1849,7 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info) /* Initialize I2C */ err = hw20k2_i2c_init(hw, 0x1A, 1, 1); if (err < 0) { - pr_alert("ctxfi: Failure to acquire I2C!!!\n"); + dev_alert(&hw->pci->dev, "ctxfi: Failure to acquire I2C!!!\n"); goto error; } @@ -1889,7 +1892,8 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info) hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x0A), MAKE_WM8775_DATA(0x0A)); } else { - pr_alert("ctxfi: Invalid master sampling rate (msr %d)!!!\n", + dev_alert(&hw->pci->dev, + "ctxfi: Invalid master sampling rate (msr %d)!!!\n", info->msr); err = -EINVAL; goto error; @@ -2033,7 +2037,8 @@ static int hw_card_start(struct hw *hw) /* Set DMA transfer mask */ if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { - pr_err("ctxfi: architecture does not support PCI busmaster DMA with mask 0x%llx\n", + dev_err(&pci->dev, + "ctxfi: architecture does not support PCI busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK); err = -ENXIO; goto error1; @@ -2062,7 +2067,8 @@ static int hw_card_start(struct hw *hw) err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED, KBUILD_MODNAME, hw); if (err < 0) { - pr_err("XFi: Cannot get irq %d\n", pci->irq); + dev_err(&pci->dev, + "XFi: Cannot get irq %d\n", pci->irq); goto error2; } hw->irq = pci->irq; diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c index 017fa91..43f3483 100644 --- a/sound/pci/ctxfi/ctmixer.c +++ b/sound/pci/ctxfi/ctmixer.c @@ -854,7 +854,8 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer) for (i = 0; i < (NUM_CT_SUMS * CHN_NUM); i++) { err = sum_mgr->get_sum(sum_mgr, &sum_desc, &sum); if (err) { - pr_err("ctxfi:Failed to get sum resources for front output!\n"); + dev_err(mixer->atc->card->dev, + "ctxfi:Failed to get sum resources for front output!\n"); break; } mixer->sums[i] = sum; @@ -868,7 +869,8 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer) for (i = 0; i < (NUM_CT_AMIXERS * CHN_NUM); i++) { err = amixer_mgr->get_amixer(amixer_mgr, &am_desc, &amixer); if (err) { - pr_err("ctxfi:Failed to get amixer resources for mixer obj!\n"); + dev_err(mixer->atc->card->dev, + "ctxfi:Failed to get amixer resources for mixer obj!\n"); break; } mixer->amixers[i] = amixer; diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c index 6826c2c..2f84348 100644 --- a/sound/pci/ctxfi/ctpcm.c +++ b/sound/pci/ctxfi/ctpcm.c @@ -217,7 +217,8 @@ static int ct_pcm_playback_prepare(struct snd_pcm_substream *substream) err = atc->pcm_playback_prepare(atc, apcm); if (err < 0) { - pr_err("ctxfi: Preparing pcm playback failed!!!\n"); + dev_err(atc->card->dev, + "ctxfi: Preparing pcm playback failed!!!\n"); return err; } @@ -324,7 +325,8 @@ static int ct_pcm_capture_prepare(struct snd_pcm_substream *substream) err = atc->pcm_capture_prepare(atc, apcm); if (err < 0) { - pr_err("ctxfi: Preparing pcm capture failed!!!\n"); + dev_err(atc->card->dev, + "ctxfi: Preparing pcm capture failed!!!\n"); return err; } @@ -435,7 +437,8 @@ int ct_alsa_pcm_create(struct ct_atc *atc, err = snd_pcm_new(atc->card, "ctxfi", device, playback_count, capture_count, &pcm); if (err < 0) { - pr_err("ctxfi: snd_pcm_new failed!! Err=%d\n", err); + dev_err(atc->card->dev, + "ctxfi: snd_pcm_new failed!! Err=%d\n", err); return err; } diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c index e49d2be..80beecb 100644 --- a/sound/pci/ctxfi/ctresource.c +++ b/sound/pci/ctxfi/ctresource.c @@ -162,12 +162,14 @@ int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw) case DAIO: break; default: - pr_err("ctxfi: Invalid resource type value %d!\n", type); + dev_err(&(((struct hw *)hw)->pci->dev), + "ctxfi: Invalid resource type value %d!\n", type); return -EINVAL; } if (err) { - pr_err("ctxfi: Failed to get resource control block!\n"); + dev_err(&(((struct hw *)hw)->pci->dev), + "ctxfi: Failed to get resource control block!\n"); return err; } @@ -190,7 +192,8 @@ int rsc_uninit(struct rsc *rsc) case DAIO: break; default: - pr_err("ctxfi: Invalid resource type value %d!\n", + dev_err(&(((struct hw *)rsc->hw)->pci->dev), + "ctxfi: Invalid resource type value %d!\n", rsc->type); break; } @@ -233,13 +236,15 @@ int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type, case SUM: break; default: - pr_err("ctxfi: Invalid resource type value %d!\n", type); + dev_err(&hw->pci->dev, + "ctxfi: Invalid resource type value %d!\n", type); err = -EINVAL; goto error; } if (err) { - pr_err("ctxfi: Failed to get manager control block!\n"); + dev_err(&hw->pci->dev, + "ctxfi: Failed to get manager control block!\n"); goto error; } @@ -282,8 +287,9 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr) case SUM: break; default: - pr_err("ctxfi: Invalid resource type value %d!\n", - mgr->type); + dev_err(&(((struct hw *)mgr->hw)->pci->dev), + "ctxfi: Invalid resource type value %d!\n", + mgr->type); break; } diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c index 35e85ba..2eae617 100644 --- a/sound/pci/ctxfi/xfi.c +++ b/sound/pci/ctxfi/xfi.c @@ -76,15 +76,18 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) if (err) return err; if ((reference_rate != 48000) && (reference_rate != 44100)) { - pr_err("ctxfi: Invalid reference_rate value %u!!!\n", - reference_rate); - pr_err("ctxfi: The valid values for reference_rate are 48000 and 44100, Value 48000 is assumed.\n"); + dev_err(card->dev, + "ctxfi: Invalid reference_rate value %u!!!\n", + reference_rate); + dev_err(card->dev, + "ctxfi: The valid values for reference_rate are 48000 and 44100, Value 48000 is assumed.\n"); reference_rate = 48000; } if ((multiple != 1) && (multiple != 2) && (multiple != 4)) { - pr_err("ctxfi: Invalid multiple value %u!!!\n", - multiple); - pr_err("ctxfi: The valid values for multiple are 1, 2 and 4, Value 2 is assumed.\n"); + dev_err(card->dev, "ctxfi: Invalid multiple value %u!!!\n", + multiple); + dev_err(card->dev, + "ctxfi: The valid values for multiple are 1, 2 and 4, Value 2 is assumed.\n"); multiple = 2; } err = ct_atc_create(card, pci, reference_rate, multiple,
pr_* macros replaced with dev_* as they are more preffered over pr_*. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- in v1 Takashi mentioned that now we have card->dev so v2 is using card->dev as much as possible. sound/pci/ctxfi/ctatc.c | 24 ++++++++++++++---------- sound/pci/ctxfi/cthw20k1.c | 15 +++++++++------ sound/pci/ctxfi/cthw20k2.c | 22 ++++++++++++++-------- sound/pci/ctxfi/ctmixer.c | 6 ++++-- sound/pci/ctxfi/ctpcm.c | 9 ++++++--- sound/pci/ctxfi/ctresource.c | 20 +++++++++++++------- sound/pci/ctxfi/xfi.c | 15 +++++++++------ 7 files changed, 69 insertions(+), 42 deletions(-)