aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-02-27 20:49:46 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:54:25 -0700
commit536165d8ef6933131bf7166338eafa77b75f8bb7 (patch)
treebd810f758fbf318006712ff8b266cd29be24e5c7 /drivers/staging
parentb702ed253d33d056987e92299687d8ed85195896 (diff)
Staging: line6: fix up NULL assignment mistakes
Should use NULL for a pointer, not 0, otherwise sparse complains. Cc: Markus Grabner <grabner@icg.tugraz.at> Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/line6/audio.c4
-rw-r--r--drivers/staging/line6/capture.c2
-rw-r--r--drivers/staging/line6/driver.c14
-rw-r--r--drivers/staging/line6/midibuf.c8
-rw-r--r--drivers/staging/line6/playback.c2
-rw-r--r--drivers/staging/line6/toneport.c2
6 files changed, 15 insertions, 17 deletions
diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c
index d035420c7bf..37f759a7615 100644
--- a/drivers/staging/line6/audio.c
+++ b/drivers/staging/line6/audio.c
@@ -62,10 +62,10 @@ void line6_cleanup_audio(struct usb_line6 *line6)
{
struct snd_card *card = line6->card;
- if(card == 0)
+ if (card == NULL)
return;
snd_card_disconnect(card);
snd_card_free(card);
- line6->card = 0;
+ line6->card = NULL;
}
diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
index a4628bd61ca..d6c1d1a7045 100644
--- a/drivers/staging/line6/capture.c
+++ b/drivers/staging/line6/capture.c
@@ -279,7 +279,7 @@ static int snd_line6_capture_hw_free(struct snd_pcm_substream *substream)
if(line6pcm->buffer_in) {
kfree(line6pcm->buffer_in);
- line6pcm->buffer_in = 0;
+ line6pcm->buffer_in = NULL;
}
return snd_pcm_lib_free_pages(substream);
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index cf01abcc467..0484ee60778 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -301,7 +301,7 @@ char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, int code2, in
if(!buffer) {
dev_err(line6->ifcdev, "out of memory\n");
- return 0;
+ return NULL;
}
buffer[0] = LINE6_SYSEX_BEGIN;
@@ -469,7 +469,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data, size_t dat
/* query the serial number: */
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
- (datalen << 8) | 0x21, address, 0, 0, LINE6_TIMEOUT * HZ);
+ (datalen << 8) | 0x21, address, NULL, 0, LINE6_TIMEOUT * HZ);
if(ret < 0) {
dev_err(line6->ifcdev, "read request failed (error %d)\n", ret);
@@ -630,8 +630,8 @@ static void line6_list_devices(void)
static int line6_probe(struct usb_interface *interface, const struct usb_device_id *id)
{
int devtype;
- struct usb_device *usbdev = 0;
- struct usb_line6 *line6 = 0;
+ struct usb_device *usbdev = NULL;
+ struct usb_line6 *line6 = NULL;
const struct line6_properties *properties;
int devnum;
int interface_number, alternate = 0;
@@ -987,7 +987,7 @@ static void line6_disconnect(struct usb_interface *interface)
for(i = LINE6_MAX_DEVICES; i--;)
if(line6_devices[i] == line6)
- line6_devices[i] = 0;
+ line6_devices[i] = NULL;
}
line6_destruct(interface);
@@ -1016,13 +1016,13 @@ static int __init line6_init(void)
printk("%s driver version %s%s\n", DRIVER_NAME, DRIVER_VERSION, DRIVER_REVISION);
line6_workqueue = create_workqueue(DRIVER_NAME);
- if(line6_workqueue == 0) {
+ if (line6_workqueue == NULL) {
err("couldn't create workqueue");
return -EINVAL;
}
for(i = LINE6_MAX_DEVICES; i--;)
- line6_devices[i] = 0;
+ line6_devices[i] = NULL;
retval = usb_register(&line6_driver);
diff --git a/drivers/staging/line6/midibuf.c b/drivers/staging/line6/midibuf.c
index 1f5934e3212..5726bb148a5 100644
--- a/drivers/staging/line6/midibuf.c
+++ b/drivers/staging/line6/midibuf.c
@@ -44,7 +44,7 @@ int midibuf_init(struct MidiBuffer *this, int size, int split)
{
this->buf = (unsigned char *)kmalloc(size, GFP_KERNEL);
- if(this->buf == 0)
+ if (this->buf == NULL)
return -ENOMEM;
this->size = size;
@@ -261,8 +261,6 @@ int midibuf_skip_message(struct MidiBuffer *this, unsigned short mask)
void midibuf_destroy(struct MidiBuffer *this)
{
- if(this->buf != 0) {
- kfree(this->buf);
- this->buf = 0;
- }
+ kfree(this->buf);
+ this->buf = NULL;
}
diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index c30c627efdd..34cfbdbb15a 100644
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -329,7 +329,7 @@ static int snd_line6_playback_hw_free(struct snd_pcm_substream *substream)
if(line6pcm->wrap_out) {
kfree(line6pcm->wrap_out);
- line6pcm->wrap_out = 0;
+ line6pcm->wrap_out = NULL;
}
return snd_pcm_lib_free_pages(substream);
diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
index 041b2c8d143..d894f4851ef 100644
--- a/drivers/staging/line6/toneport.c
+++ b/drivers/staging/line6/toneport.c
@@ -117,7 +117,7 @@ static int toneport_send_cmd(struct usb_device *usbdev, int cmd1, int cmd2)
int ret;
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev,0), 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
- cmd1, cmd2, 0, 0, LINE6_TIMEOUT * HZ);
+ cmd1, cmd2, NULL, 0, LINE6_TIMEOUT * HZ);
if(ret < 0) {
err("send failed (error %d)\n", ret);