ALSA: au88x0: added reference of vortex_t
PATCH 1/2 ALSA: au88x0: added reference of vortex_t
added a pointer of the vortex in the following functions :
vortex_alsafmt_aspfmtvortex_Vort3D_InitializeSourcea3dsrc_ZeroStateA3D
so that we can have a reference of the vortex in the function. this reference of the vortex will actually be used in a later patch to convert the pr_* macro to dev_*.
--- sound/pci/au88x0/au88x0.h | 4 ++-- sound/pci/au88x0/au88x0_a3d.c | 6 +++--- sound/pci/au88x0/au88x0_core.c | 5 +++-- sound/pci/au88x0/au88x0_pcm.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-)
sound/pci/au88x0/au88x0.h +2 -2
@@ -243,7 +243,7 @@ static int vortex_core_init(vortex_t * card);static int vortex_core_shutdown (vortex_t * card);static void vortex_enable_int (vortex_t * card);static irqreturn_t vortex_interrupt (int irq,void *dev_id); -static int vortex_alsafmt_aspfmt (int alsafmt); +static int vortex_alsafmt_aspfmt (int alsafmt,vortex_t *v);/* Connection stuff. */ static void vortex_connect_default (vortex_t * vortex,int en);
@@ -278,7 +278,7 @@ static void vortex_mix_setvolumebyte(vortex_t * vortex, unsigned char mix,static void vortex_Vort3D_enable (vortex_t * v);static void vortex_Vort3D_disable (vortex_t * v);static void vortex_Vort3D_connect (vortex_t * vortex,int en); -static void vortex_Vort3D_InitializeSource (a3dsrc_t * a,int en); +static void vortex_Vort3D_InitializeSource (a3dsrc_t *a,int en,vortex_t *v);#endif /* Driver stuff. */
sound/pci/au88x0/au88x0_a3d.c +3 -3
@@ -484,7 +484,7 @@ static void a3dsrc_ZeroState(a3dsrc_t * a) }/* Reset entire A3D engine */ -static void a3dsrc_ZeroStateA3D (a3dsrc_t * a) +static void a3dsrc_ZeroStateA3D (a3dsrc_t *a,vortex_t *v) {int i, var, var2;
@@ -601,7 +601,7 @@ static void vortex_Vort3D_enable(vortex_t *v)Vort3DRend_Initialize (v,XT_HEADPHONE );for (i =0 ; i <NR_A3D ; i++) {vortex_A3dSourceHw_Initialize (v, i %4 , i >>2 ); -a3dsrc_ZeroStateA3D (&(v->a3d[0 ])); +a3dsrc_ZeroStateA3D (&v->a3d[0 ], v); }/* Register ALSA controls */ vortex_a3d_register_controls (v);
@@ -676,7 +676,7 @@ static void vortex_Vort3D_connect(vortex_t * v, int en) }/* Initialize one single A3D source. */ -static void vortex_Vort3D_InitializeSource (a3dsrc_t * a,int en) +static void vortex_Vort3D_InitializeSource (a3dsrc_t *a,int en,vortex_t *v) {if (a->vortex ==NULL ) { pr_warn
sound/pci/au88x0/au88x0_core.c +3 -2
@@ -2177,7 +2177,8 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,return -EBUSY ; }/* (De)Initialize A3D hardware source. */ -vortex_Vort3D_InitializeSource (&(vortex->a3d[a3d]), en); +vortex_Vort3D_InitializeSource (&vortex->a3d[a3d], en, + vortex); }/* Make SPDIF out exclusive to "spdif" device when in use. */ if ((stream->type ==VORTEX_PCM_SPDIF ) && (en)) {
@@ -2765,7 +2766,7 @@ static int vortex_core_shutdown(vortex_t * vortex)/* Alsa support. */ -static int vortex_alsafmt_aspfmt (int alsafmt) +static int vortex_alsafmt_aspfmt (int alsafmt,vortex_t *v) {int fmt;
sound/pci/au88x0/au88x0_pcm.c +1 -1
@@ -332,7 +332,7 @@ static int snd_vortex_pcm_prepare(struct snd_pcm_substream *substream) dir =1 ; else dir =0 ; - fmt =vortex_alsafmt_aspfmt (runtime->format); + fmt =vortex_alsafmt_aspfmt (runtime->format, chip);spin_lock_irq (&chip->lock);if (VORTEX_PCM_TYPE (substream->pcm) !=VORTEX_PCM_WT ) { vortex_adbdma_setmode(chip, dma, 1, dir, fmt,
Signature · 1 line
1.8.1.2
PATCH 2/2 ALSA: au88x0: pr_* replaced with dev_*
pr_* macros replaced with dev_* as they are more preffered over pr_*. each file which had pr_* was reviewed manually and replaced with dev_*. here we have actually used the reference of the vortex which was added to some functions in the previous patch of this series.
--- sound/pci/au88x0/au88x0.c | 26 +++++----- sound/pci/au88x0/au88x0_a3d.c | 15 +++--- sound/pci/au88x0/au88x0_core.c | 103 ++++++++++++++++++++++----------------- sound/pci/au88x0/au88x0_eq.c | 3 +- sound/pci/au88x0/au88x0_game.c | 3 +- sound/pci/au88x0/au88x0_mpu401.c | 2 +- sound/pci/au88x0/au88x0_pcm.c | 7 +-- sound/pci/au88x0/au88x0_synth.c | 17 ++++--- 8 files changed, 98 insertions(+), 78 deletions(-)
sound/pci/au88x0/au88x0.c +13 -13
@@ -48,10 +48,10 @@ static void vortex_fix_latency(struct pci_dev *vortex) {int rc;if (!(rc =pci_write_config_byte (vortex,0x40 ,0xff ))) { -pr_info (CARD_NAME +dev_info (&vortex->dev,CARD_NAME ": vortex latency is 0xff\n" ); }else { -pr_warn (CARD_NAME +dev_warn (&vortex->dev,CARD_NAME ": could not set vortex latency: pci error 0x%x\n" , rc); } }
@@ -70,10 +70,10 @@ static void vortex_fix_agp_bridge(struct pci_dev *via)if (!(rc =pci_read_config_byte (via,0x42 , &value)) && ((value &0x10 ) || !(rc =pci_write_config_byte (via,0x42 , value |0x10 )))) { -pr_info (CARD_NAME +dev_info (&via->dev,CARD_NAME ": bridge config is 0x%x\n" , value |0x10 ); }else { -pr_warn (CARD_NAME +dev_warn (&via->dev,CARD_NAME ": could not set vortex latency: pci error 0x%x\n" , rc); } }
@@ -97,7 +97,7 @@ static void snd_vortex_workaround(struct pci_dev *vortex, int fix) PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL); }if (via) { -pr_info (CARD_NAME ": Activating latency workaround...\n" ); +dev_info (&vortex->dev,CARD_NAME ": Activating latency workaround...\n" );vortex_fix_latency (vortex);vortex_fix_agp_bridge (via); }
@@ -153,7 +153,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)return err;if (pci_set_dma_mask (pci,DMA_BIT_MASK (32 )) <0 ||pci_set_consistent_dma_mask (pci,DMA_BIT_MASK (32 )) <0 ) { -pr_err ("error to set DMA mask\n" ); +dev_err (card->dev,"error to set DMA mask\n" );pci_disable_device (pci);return -ENXIO ; }
@@ -182,7 +182,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip) chip->mmio =pci_ioremap_bar (pci,0 );if (!chip->mmio) { -pr_err ("MMIO area remap failed.\n" ); +dev_err (card->dev,"MMIO area remap failed.\n" ); err = -ENOMEM ; goto ioremap_out; }
@@ -191,14 +191,14 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)* This must be done before we do request_irq otherwise we can get spurious * interrupts that we do not handle properly and make a mess of things */ if ((err =vortex_core_init (chip)) !=0 ) { -pr_err ("hw core init failed\n" ); +dev_err (card->dev,"hw core init failed\n" ); goto core_out; }if ((err =request_irq (pci->irq, vortex_interrupt,IRQF_SHARED ,KBUILD_MODNAME , chip)) !=0 ) { -pr_err ("cannot grab irq\n" ); +dev_err (card->dev,"cannot grab irq\n" ); goto irq_out; } chip->irq = pci->irq;
@@ -342,11 +342,11 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) chip->rev = pci->revision;#ifdef CHIP_AU8830 if ((chip->rev) !=0xfe && (chip->rev) !=0xfa ) { -pr_alert ( -"vortex: The revision (%x) of your card has not been seen before.\n" , +dev_alert (card->dev, +"vortex: The revision (%x) of your card has not been seen before.\n" , chip->rev); -pr_alert ( -"vortex: Please email the results of 'lspci -vv' to [email protected].\n" ); +dev_alert (card->dev, +"vortex: Please email the results of 'lspci -vv' to [email protected].\n" );snd_card_free (card); err = -ENODEV ;return err;
sound/pci/au88x0/au88x0_a3d.c +8 -7
@@ -489,7 +489,8 @@ static void a3dsrc_ZeroStateA3D(a3dsrc_t *a, vortex_t *v)int i, var, var2;if ((a->vortex) ==NULL ) { -pr_err ("vortex: ZeroStateA3D: ERROR: a->vortex is NULL\n" ); +dev_err (v->card->dev, +"vortex: ZeroStateA3D: ERROR: a->vortex is NULL\n" );return ; }
@@ -628,15 +629,15 @@ static void vortex_Vort3D_connect(vortex_t * v, int en) v->mixxtlk[0 ] =vortex_adb_checkinout (v, v->fixed_res, en,VORTEX_RESOURCE_MIXIN );if (v->mixxtlk[0 ] <0 ) { -pr_warn - ("vortex: vortex_Vort3D: ERROR: not enough free mixer resources.\n" ); +dev_warn (v->card->dev, +"vortex: vortex_Vort3D: ERROR: not enough free mixer resources.\n" );return ; } v->mixxtlk[1 ] =vortex_adb_checkinout (v, v->fixed_res, en,VORTEX_RESOURCE_MIXIN );if (v->mixxtlk[1 ] <0 ) { -pr_warn - ("vortex: vortex_Vort3D: ERROR: not enough free mixer resources.\n" ); +dev_warn (v->card->dev, +"vortex: vortex_Vort3D: ERROR: not enough free mixer resources.\n" );return ; }#endif
@@ -679,8 +680,8 @@ static void vortex_Vort3D_connect(vortex_t * v, int en)static void vortex_Vort3D_InitializeSource (a3dsrc_t *a,int en,vortex_t *v) {if (a->vortex ==NULL ) { -pr_warn - ("vortex: Vort3D_InitializeSource: A3D source not initialized\n" ); +dev_warn (v->card->dev, +"vortex: Vort3D_InitializeSource: A3D source not initialized\n" );return ; }if (en) {
sound/pci/au88x0/au88x0_core.c +58 -45
279 lines not on this page · raw message
sound/pci/au88x0/au88x0_eq.c +2 -1
@@ -845,7 +845,8 @@ snd_vortex_peaks_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *uvortex_Eqlzr_GetAllPeaks (vortex, peaks, &count);if (count !=20 ) { -pr_err ("vortex: peak count error 20 != %d \n" , count); +dev_err (vortex->card->dev, +"vortex: peak count error 20 != %d\n" , count);return -1 ; }for (i =0 ; i <20 ; i++)
sound/pci/au88x0/au88x0_game.c +2 -1
@@ -98,7 +98,8 @@ static int vortex_gameport_register(vortex_t *vortex) vortex->gameport = gp =gameport_allocate_port ();if (!gp) { -pr_err ("vortex: cannot allocate memory for gameport\n" ); +dev_err (vortex->card->dev, +"vortex: cannot allocate memory for gameport\n" );return -ENOMEM ; }
sound/pci/au88x0/au88x0_mpu401.c +1 -1
@@ -73,7 +73,7 @@ static int snd_vortex_midi(vortex_t *vortex)/* Check if anything is OK. */ temp =hwread (vortex->mmio,VORTEX_MIDI_DATA );if (temp !=MPU401_ACK /*0xfe */ ) { -pr_err ("midi port doesn't acknowledge!\n" ); +dev_err (vortex->card->dev,"midi port doesn't acknowledge!\n" );return -ENODEV ; }/* Enable MPU401 interrupts. */
sound/pci/au88x0/au88x0_pcm.c +4 -3
@@ -227,7 +227,7 @@ snd_vortex_pcm_hw_params(struct snd_pcm_substream *substream, err =snd_pcm_lib_malloc_pages (substream,params_buffer_bytes (hw_params));if (err <0 ) { -pr_err ("Vortex: pcm page alloc failed!\n" ); +dev_err (chip->card->dev,"Vortex: pcm page alloc failed!\n" );return err; }/*
@@ -371,7 +371,8 @@ static int snd_vortex_pcm_trigger(struct snd_pcm_substream *substream, int cmd) }#ifndef CHIP_AU8810 else { -pr_info ("vortex: wt start %d\n" , dma); +dev_info (chip->card->dev, +"vortex: wt start %d\n" , dma);vortex_wtdma_startfifo (chip, dma); }#endif
@@ -384,7 +385,7 @@ static int snd_vortex_pcm_trigger(struct snd_pcm_substream *substream, int cmd)vortex_adbdma_stopfifo (chip, dma);#ifndef CHIP_AU8810 else { -pr_info ("vortex: wt stop %d\n" , dma); +dev_info (chip->card->dev,"vortex: wt stop %d\n" , dma);vortex_wtdma_stopfifo (chip, dma); }#endif
sound/pci/au88x0/au88x0_synth.c +10 -7
@@ -90,7 +90,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch)hwwrite (vortex->mmio,WT_PARM (wt,2 ),0 ); temp =hwread (vortex->mmio,WT_PARM (wt,3 )); -pr_debug ("vortex: WT PARM3: %x\n" , temp); +dev_dbg (vortex->card->dev,"vortex: WT PARM3: %x\n" , temp);//hwwrite(vortex->mmio, WT_PARM(wt, 3), temp); hwwrite (vortex->mmio,WT_DELAY (wt,0 ),0 );
@@ -98,7 +98,8 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch)hwwrite (vortex->mmio,WT_DELAY (wt,2 ),0 );hwwrite (vortex->mmio,WT_DELAY (wt,3 ),0 ); -pr_debug ("vortex: WT GMODE: %x\n" ,hwread (vortex->mmio,WT_GMODE (wt))); +dev_dbg (vortex->card->dev,"vortex: WT GMODE: %x\n" , +hwread (vortex->mmio,WT_GMODE (wt)));hwwrite (vortex->mmio,WT_PARM (wt,2 ),0xffffffff );hwwrite (vortex->mmio,WT_PARM (wt,3 ),0xcff1c810 );
@@ -106,7 +107,8 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch) voice->parm0 = voice->parm1 =0xcfb23e2f ;hwwrite (vortex->mmio,WT_PARM (wt,0 ), voice->parm0);hwwrite (vortex->mmio,WT_PARM (wt,1 ), voice->parm1); -pr_debug ("vortex: WT GMODE 2 : %x\n" ,hwread (vortex->mmio,WT_GMODE (wt))); +dev_dbg (vortex->card->dev,"vortex: WT GMODE 2 : %x\n" , +hwread (vortex->mmio,WT_GMODE (wt)));return 0 ; }
@@ -196,14 +198,15 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,if ((reg ==5 ) || ((reg >=7 ) && (reg <=10 )) || (reg ==0xc )) {if (wt >= (NR_WT /NR_WT_PB )) { -pr_warn - ("vortex: WT SetReg: bank out of range. reg=0x%x, wt=%d\n" , - reg, wt); +dev_warn (vortex->card->dev, +"vortex: WT SetReg: bank out of range. reg=0x%x, wt=%d\n" , + reg, wt);return 0 ; } }else {if (wt >=NR_WT ) { -pr_err ("vortex: WT SetReg: voice out of range\n" ); +dev_err (vortex->card->dev, +"vortex: WT SetReg: voice out of range\n" );return 0 ; } }
Signature · 1 line
1.8.1.2
Re: [PATCH 2/2] ALSA: au88x0: pr_* replaced with dev_*
At Thu, 9 Oct 2014 15:06:37 +0530,
Quoted 23 lines · Sudip Mukherjee
pr_* macros replaced with dev_* as they are more preffered over pr_*. each file which had pr_* was reviewed manually and replaced with dev_*. here we have actually used the reference of the vortex which was added to some functions in the previous patch of this series.
Signed-off-by Sudip Mukherjee <[email protected]>--- sound/pci/au88x0/au88x0.c | 26 +++++----- sound/pci/au88x0/au88x0_a3d.c | 15 +++--- sound/pci/au88x0/au88x0_core.c | 103 ++++++++++++++++++++++----------------- sound/pci/au88x0/au88x0_eq.c | 3 +- sound/pci/au88x0/au88x0_game.c | 3 +- sound/pci/au88x0/au88x0_mpu401.c | 2 +- sound/pci/au88x0/au88x0_pcm.c | 7 +-- sound/pci/au88x0/au88x0_synth.c | 17 ++++--- 8 files changed, 98 insertions(+), 78 deletions(-)sound/pci/au88x0/au88x0.c +0
-0
sound/pci/au88x0/au88x0.c static void vortex_fix_latency(struct pci_dev *vortex) · line 52
Quoted 6 lines
sound/pci/au88x0/au88x0.c +1
-1@@ -48,10 +48,10 @@ static void vortex_fix_latency(struct pci_dev *vortex) {int rc;if (!(rc =pci_write_config_byte (vortex,0x40 ,0xff ))) { -pr_info (CARD_NAME +dev_info (&vortex->dev,CARD_NAME ": vortex latency is 0xff\n" );
Omit the superfluous prefix when converting to dev_info() & co. Other than that, looks good to me.
thanks,
Takashi
Re: [PATCH 2/2] ALSA: au88x0: pr_* replaced with dev_*
Quoted 20 lines · Takashi Iwai
At Thu, 9 Oct 2014 15:06:37 +0530,
Quoted 18 lines · Sudip Mukherjee
pr_* macros replaced with dev_* as they are more preffered over pr_*. each file which had pr_* was reviewed manually and replaced with dev_*. here we have actually used the reference of the vortex which was added to some functions in the previous patch of this series.
Signed-off-by Sudip Mukherjee <[email protected]>--- sound/pci/au88x0/au88x0.c | 26 +++++----- sound/pci/au88x0/au88x0_a3d.c | 15 +++--- sound/pci/au88x0/au88x0_core.c | 103 ++++++++++++++++++++++----------------- sound/pci/au88x0/au88x0_eq.c | 3 +- sound/pci/au88x0/au88x0_game.c | 3 +- sound/pci/au88x0/au88x0_mpu401.c | 2 +- sound/pci/au88x0/au88x0_pcm.c | 7 +-- sound/pci/au88x0/au88x0_synth.c | 17 ++++--- 8 files changed, 98 insertions(+), 78 deletions(-)
Quoted 1 line
sound/pci/au88x0/au88x0.c
Quoted 1 line
sound/pci/au88x0/au88x0.c +0
-0
[]
Quoted 10 lines
sound/pci/au88x0/au88x0.c static void vortex_fix_latency(struct pci_dev *vortex) · line 52
Quoted 7 lines
sound/pci/au88x0/au88x0.c +1
-1@@ -48,10 +48,10 @@ static void vortex_fix_latency(struct pci_dev *vortex) {int rc;if (!(rc =pci_write_config_byte (vortex,0x40 ,0xff ))) { -pr_info (CARD_NAME +dev_info (&vortex->dev,CARD_NAME ": vortex latency is 0xff\n" );Omit the superfluous prefix when converting to
dev_info()& co. Other than that, looks good to me.
Hi Sudip.
Probably all the uses of CARD_NAME and "vortex" singly and in combination should be removed in all these conversions.
Re: [PATCH 2/2] ALSA: au88x0: pr_* replaced with dev_*
Quoted 3 lines · Joe Perches
Quoted 2 lines · Takashi Iwai
At Thu, 9 Oct 2014 15:06:37 +0530,
Sudip Mukherjee wrote:
<snip>
Quoted 13 lines
Quoted 1 line
sound/pci/au88x0/au88x0.c
Quoted 1 line
sound/pci/au88x0/au88x0.c +0
-0[]
Quoted 10 lines
sound/pci/au88x0/au88x0.c static void vortex_fix_latency(struct pci_dev *vortex) · line 52
Quoted 7 lines
sound/pci/au88x0/au88x0.c +1
-1@@ -48,10 +48,10 @@ static void vortex_fix_latency(struct pci_dev *vortex) {int rc;if (!(rc =pci_write_config_byte (vortex,0x40 ,0xff ))) { -pr_info (CARD_NAME +dev_info (&vortex->dev,CARD_NAME ": vortex latency is 0xff\n" );Omit the superfluous prefix when converting to
dev_info()& co. Other than that, looks good to me.
Quoted 5 lines
Hi Sudip.
Probably all the uses of
CARD_NAMEand "vortex" singly and in combination should be removed in all these conversions.
Hi Takashi and Joe,
I knew Takashi will ask to remove the CARD_NAME , so i have looked at the possibility while modifying the code. CARD_NAME will be "Aureal Advantage" or "Aureal Vortex" or "Aureal Vortex 2" based on which chip is defined. So I thought, if we remove the prefix then we will not get the exact card name. dev_* will print the device name as CARD_NAME_SHORT which will be au8810 or au8820 or au8830.
so, now waiting for your suggestion ..
thanks
sudip
Quoted 1 line
Re: [PATCH 2/2] ALSA: au88x0: pr_* replaced with dev_*
Quoted 4 lines · Sudip Mukherjee
if we remove the prefix then we will not get the exact card name. dev_* will print the device name as
CARD_NAME_SHORTwhich will be au8810 or au8820 or au8830.
so, now waiting for your suggestion ..
I think the au88x0 prefix is sufficient.
Re: [PATCH 2/2] ALSA: au88x0: pr_* replaced with dev_*
In reply to Sudip MukherjeeAt Fri, 10 Oct 2014 11:47:02 +0530,
Quoted 21 lines · Sudip Mukherjee
Quoted 3 lines · Joe Perches
Quoted 2 lines · Takashi Iwai
At Thu, 9 Oct 2014 15:06:37 +0530,
Sudip Mukherjee wrote:<snip>
Quoted 15 lines
Quoted 1 line
sound/pci/au88x0/au88x0.c
Quoted 1 line
sound/pci/au88x0/au88x0.c +0
-0[]
Quoted 10 lines
sound/pci/au88x0/au88x0.c static void vortex_fix_latency(struct pci_dev *vortex) · line 52
Quoted 7 lines
sound/pci/au88x0/au88x0.c +1
-1@@ -48,10 +48,10 @@ static void vortex_fix_latency(struct pci_dev *vortex) {int rc;if (!(rc =pci_write_config_byte (vortex,0x40 ,0xff ))) { -pr_info (CARD_NAME +dev_info (&vortex->dev,CARD_NAME ": vortex latency is 0xff\n" );Omit the superfluous prefix when converting to
dev_info()& co. Other than that, looks good to me.Hi Sudip.
Quoted 8 lines
Quoted 3 lines
Probably all the uses of
CARD_NAMEand "vortex" singly and in combination should be removed in all these conversions.Hi Takashi and Joe,
I knew Takashi will ask to remove theCARD_NAME, so i have looked at the possibility while modifying the code.CARD_NAMEwill be "Aureal Advantage" or "Aureal Vortex" or "Aureal Vortex 2" based on which chip is defined. So I thought, if we remove the prefix then we will not get the exact card name. dev_* will print the device name asCARD_NAME_SHORTwhich will be au8810 or au8820 or au8830.
As the driver corresponds to each card as 1:1, it's fine to show only the driver name.
Takashi