Skip to contentSkip to conversation

sound: au88x0_pcm.c fix integer as NULL pointer warning

PATCH Applied Harvey Harrison 2 participants 4 messages Feb 28, 2008 – Feb 29, 2008 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 10/12 sound: au88x0_pcm.c fix integer as NULL pointer warning

sound/pci/au88x0/au88x0_pcm.c:508:15: warning: Using plain integer as NULL pointer

---
 sound/pci/au88x0/au88x0_pcm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/pci/au88x0/au88x0_pcm.c +1 -1
index 526c6c5..232eb80 100644
@@ -505,7 +505,7 @@ static int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr)
 	int i;
 	int err, nr_capt;
 
-	if ((chip == 0) || (idx < 0) || (idx >= VORTEX_PCM_LAST))
+	if ((chip == NULL) || (idx < 0) || (idx >= VORTEX_PCM_LAST))
 		return -ENODEV;
 
 	/* idx indicates which kind of PCM device. ADB, SPDIF, I2S and A3D share the 
Signature · 1 line
1.5.4.3.342.g99e8
#1 lore raw

At Wed, 27 Feb 2008 16:56:08 -0800,

Quoted 13 lines · Harvey Harrison

sound/pci/au88x0/au88x0_pcm.c:508:15: warning: Using plain integer as NULL pointer

---
 sound/pci/au88x0/au88x0_pcm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/pci/au88x0/au88x0_pcm.c +0 -0
index 526c6c5..232eb80 100644

sound/pci/au88x0/au88x0_pcm.c static int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr) · line 508

Quoted 5 lines
sound/pci/au88x0/au88x0_pcm.c +1 -1
@@ -505,7 +505,7 @@ static int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr)
 	int i;
 	int err, nr_capt;
 
-	if ((chip == 0) || (idx < 0) || (idx >= VORTEX_PCM_LAST))
+	if ((chip == NULL) || (idx < 0) || (idx >= VORTEX_PCM_LAST))

"if (!chip)" is the standard style. Let's fix in that way. Also, strip unneeded parentheses.

thanks,

Takashi

#2 lore raw

PATCH 1/1 sound: au88x0_pcm.c fix integer as NULL pointer warning

sound/pci/au88x0/au88x0_pcm.c:508:15: warning: Using plain integer as NULL pointer

Also some small codingstyle fixes.

---
 sound/pci/au88x0/au88x0_pcm.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
sound/pci/au88x0/au88x0_pcm.c +5 -5
index 526c6c5..f9a58b4 100644
@@ -498,14 +498,14 @@ static struct snd_kcontrol_new snd_vortex_mixer_spdif[] __devinitdata = {
 };
 
 /* create a pcm device */
-static int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr)
+static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
 {
 	struct snd_pcm *pcm;
 	struct snd_kcontrol *kctl;
 	int i;
 	int err, nr_capt;
 
-	if ((chip == 0) || (idx < 0) || (idx >= VORTEX_PCM_LAST))
+	if (!chip || idx < 0 || idx >= VORTEX_PCM_LAST)
 		return -ENODEV;
 
 	/* idx indicates which kind of PCM device. ADB, SPDIF, I2S and A3D share the 
@@ -514,9 +514,9 @@ static int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr)
 		nr_capt = nr;
 	else
 		nr_capt = 0;
-	if ((err =
-	     snd_pcm_new(chip->card, vortex_pcm_prettyname[idx], idx, nr,
-			 nr_capt, &pcm)) < 0)
+	err = snd_pcm_new(chip->card, vortex_pcm_prettyname[idx], idx, nr,
+			  nr_capt, &pcm);
+	if (err < 0)
 		return err;
 	strcpy(pcm->name, vortex_pcm_name[idx]);
 	chip->pcm[idx] = pcm;
Signature · 1 line
1.5.4.3.342.g99e8
Applied
#3 lore raw

At Thu, 28 Feb 2008 10:06:49 -0800,

Quoted 6 lines · Harvey Harrison

sound/pci/au88x0/au88x0_pcm.c:508:15: warning: Using plain integer as NULL pointer

Also some small codingstyle fixes.

Applied to ALSA tree. Thanks.

Takashi