2010-12-07 22:38:08

by Peter Huewe

Subject: [PATCH] staging/line6: Fix sparse warning 'Using plain integer as NULL pointer'

This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.

Signed-off-by: Peter Huewe <[email protected]>
---
KernelVersion: linux-next-20101207
(line6 staging driver does currently _not_ build, but this is not caused by this patch.
Maybe I'll have a look at it.)

drivers/staging/line6/capture.c | 2 +-
drivers/staging/line6/midi.c | 4 ++--
drivers/staging/line6/playback.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
index 1e3bb14..9647154 100644
--- a/drivers/staging/line6/capture.c
+++ b/drivers/staging/line6/capture.c
@@ -147,7 +147,7 @@ void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf, int fsize)
const int bytes_per_frame = line6pcm->properties->bytes_per_frame;
int frames = fsize / bytes_per_frame;

- if (runtime == 0)
+ if (runtime == NULL)
return;

if (line6pcm->pos_in_done + frames > runtime->buffer_size) {
diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index ab67e88..e554a2d 100644
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -127,7 +127,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,

urb = usb_alloc_urb(0, GFP_ATOMIC);

- if (urb == 0) {
+ if (urb == NULL) {
dev_err(line6->ifcdev, "Out of memory\n");
return -ENOMEM;
}
@@ -137,7 +137,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,

transfer_buffer = kmalloc(length, GFP_ATOMIC);

- if (transfer_buffer == 0) {
+ if (transfer_buffer == NULL) {
usb_free_urb(urb);
dev_err(line6->ifcdev, "Out of memory\n");
return -ENOMEM;
diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index 29940fd..10c5438 100644
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -246,7 +246,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)

change_volume(urb_out, line6pcm->volume_playback, bytes_per_frame);

- if (line6pcm->prev_fbuf != 0) {
+ if (line6pcm->prev_fbuf != NULL) {
#ifdef CONFIG_LINE6_USB_IMPULSE_RESPONSE
if (line6pcm->flags & MASK_PCM_IMPULSE) {
create_impulse_test_signal(line6pcm, urb_out,
--
1.7.2.2

2010-12-08 22:37:51

by Greg KH

Subject: Re: [PATCH] staging/line6: Fix sparse warning 'Using plain integer as NULL pointer'

On Tue, Dec 07, 2010 at 11:38:02PM +0100, Peter Huewe wrote:
> This patch fixes the warning generated by sparse: "Using plain integer
> as NULL pointer" by replacing the offending 0s with NULL.
>
> Signed-off-by: Peter Huewe <[email protected]>
> ---
> KernelVersion: linux-next-20101207
> (line6 staging driver does currently _not_ build, but this is not caused by this patch.
> Maybe I'll have a look at it.)

It builds just fine for me here, what errors are you seeing?

thanks,

greg k-h

2010-12-08 22:46:51

by Peter Huewe

Subject: Re: [PATCH] staging/line6: Fix sparse warning 'Using plain integer as NULL pointer'

Am Mittwoch 08 Dezember 2010, 23:30:23 schrieb Greg KH:

> It builds just fine for me here, what errors are you seeing?
Sparse errors ;) - I'm still getting confused what the output of sparse and
what the output of gcc is.
Sorry about that - code builds fine.


Peter