Commit 5fa1247a authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

NULL noise: drivers/media

Acked-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8481664d
...@@ -306,25 +306,22 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id) ...@@ -306,25 +306,22 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id)
return IRQ_NONE; return IRQ_NONE;
} }
if( 0 != (dev->ext)) { if (dev->ext) {
if( 0 != (dev->ext->irq_mask & isr )) { if (dev->ext->irq_mask & isr) {
if( 0 != dev->ext->irq_func ) { if (dev->ext->irq_func)
dev->ext->irq_func(dev, &isr); dev->ext->irq_func(dev, &isr);
}
isr &= ~dev->ext->irq_mask; isr &= ~dev->ext->irq_mask;
} }
} }
if (0 != (isr & (MASK_27))) { if (0 != (isr & (MASK_27))) {
DEB_INT(("irq: RPS0 (0x%08x).\n",isr)); DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
if( 0 != dev->vv_data && 0 != dev->vv_callback) { if (dev->vv_data && dev->vv_callback)
dev->vv_callback(dev,isr); dev->vv_callback(dev,isr);
}
isr &= ~MASK_27; isr &= ~MASK_27;
} }
if (0 != (isr & (MASK_28))) { if (0 != (isr & (MASK_28))) {
if( 0 != dev->vv_data && 0 != dev->vv_callback) { if (dev->vv_data && dev->vv_callback)
dev->vv_callback(dev,isr); dev->vv_callback(dev,isr);
}
isr &= ~MASK_28; isr &= ~MASK_28;
} }
if (0 != (isr & (MASK_16|MASK_17))) { if (0 != (isr & (MASK_16|MASK_17))) {
......
...@@ -272,7 +272,7 @@ static int fops_open(struct inode *inode, struct file *file) ...@@ -272,7 +272,7 @@ static int fops_open(struct inode *inode, struct file *file)
result = 0; result = 0;
out: out:
if( fh != 0 && result != 0 ) { if (fh && result != 0) {
kfree(fh); kfree(fh);
file->private_data = NULL; file->private_data = NULL;
} }
......
...@@ -784,8 +784,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len, ...@@ -784,8 +784,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
{ {
struct net_device *dev = feed->priv; struct net_device *dev = feed->priv;
if (buffer2 != 0) if (buffer2)
printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2); printk(KERN_WARNING "buffer2 not NULL: %p.\n", buffer2);
if (buffer1_len > 32768) if (buffer1_len > 32768)
printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len); printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len);
/* printk("TS callback: %u bytes, %u TS cells @ %p.\n", /* printk("TS callback: %u bytes, %u TS cells @ %p.\n",
......
...@@ -408,7 +408,7 @@ adv7170_detect_client (struct i2c_adapter *adapter, ...@@ -408,7 +408,7 @@ adv7170_detect_client (struct i2c_adapter *adapter,
return 0; return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0) if (!client)
return -ENOMEM; return -ENOMEM;
client->addr = address; client->addr = address;
client->adapter = adapter; client->adapter = adapter;
......
...@@ -426,7 +426,7 @@ adv7175_detect_client (struct i2c_adapter *adapter, ...@@ -426,7 +426,7 @@ adv7175_detect_client (struct i2c_adapter *adapter,
return 0; return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0) if (!client)
return -ENOMEM; return -ENOMEM;
client->addr = address; client->addr = address;
client->adapter = adapter; client->adapter = adapter;
......
...@@ -524,7 +524,7 @@ bt819_detect_client (struct i2c_adapter *adapter, ...@@ -524,7 +524,7 @@ bt819_detect_client (struct i2c_adapter *adapter,
return 0; return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0) if (!client)
return -ENOMEM; return -ENOMEM;
client->addr = address; client->addr = address;
client->adapter = adapter; client->adapter = adapter;
......
...@@ -311,7 +311,7 @@ bt856_detect_client (struct i2c_adapter *adapter, ...@@ -311,7 +311,7 @@ bt856_detect_client (struct i2c_adapter *adapter,
return 0; return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0) if (!client)
return -ENOMEM; return -ENOMEM;
client->addr = address; client->addr = address;
client->adapter = adapter; client->adapter = adapter;
......
...@@ -131,7 +131,7 @@ static int dpc_probe(struct saa7146_dev* dev) ...@@ -131,7 +131,7 @@ static int dpc_probe(struct saa7146_dev* dev)
device_for_each_child(&dpc->i2c_adapter.dev, dpc, dpc_check_clients); device_for_each_child(&dpc->i2c_adapter.dev, dpc, dpc_check_clients);
/* check if all devices are present */ /* check if all devices are present */
if( 0 == dpc->saa7111a ) { if (!dpc->saa7111a) {
DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n")); DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n"));
i2c_del_adapter(&dpc->i2c_adapter); i2c_del_adapter(&dpc->i2c_adapter);
kfree(dpc); kfree(dpc);
......
...@@ -647,7 +647,7 @@ struct dvb_frontend *microtune_attach(struct dvb_frontend *fe, ...@@ -647,7 +647,7 @@ struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
default: default:
tuner_info("microtune %s found, not (yet?) supported, sorry :-/\n", tuner_info("microtune %s found, not (yet?) supported, sorry :-/\n",
name); name);
return 0; return NULL;
} }
strlcpy(fe->ops.tuner_ops.info.name, name, strlcpy(fe->ops.tuner_ops.info.name, name,
......
...@@ -221,9 +221,8 @@ static int mxb_probe(struct saa7146_dev* dev) ...@@ -221,9 +221,8 @@ static int mxb_probe(struct saa7146_dev* dev)
device_for_each_child(&mxb->i2c_adapter.dev, mxb, mxb_check_clients); device_for_each_child(&mxb->i2c_adapter.dev, mxb, mxb_check_clients);
/* check if all devices are present */ /* check if all devices are present */
if( 0 == mxb->tea6420_1 || 0 == mxb->tea6420_2 || 0 == mxb->tea6415c if (!mxb->tea6420_1 || !mxb->tea6420_2 || !mxb->tea6415c ||
|| 0 == mxb->tda9840 || 0 == mxb->saa7111a || 0 == mxb->tuner ) { !mxb->tda9840 || !mxb->saa7111a || !mxb->tuner) {
printk("mxb: did not find all i2c devices. aborting\n"); printk("mxb: did not find all i2c devices. aborting\n");
i2c_del_adapter(&mxb->i2c_adapter); i2c_del_adapter(&mxb->i2c_adapter);
kfree(mxb); kfree(mxb);
......
...@@ -60,7 +60,7 @@ int pvr2_ctrl_set_mask_value(struct pvr2_ctrl *cptr,int mask,int val) ...@@ -60,7 +60,7 @@ int pvr2_ctrl_set_mask_value(struct pvr2_ctrl *cptr,int mask,int val)
int ret = 0; int ret = 0;
if (!cptr) return -EINVAL; if (!cptr) return -EINVAL;
LOCK_TAKE(cptr->hdw->big_lock); do { LOCK_TAKE(cptr->hdw->big_lock); do {
if (cptr->info->set_value != 0) { if (cptr->info->set_value) {
if (cptr->info->type == pvr2_ctl_bitmask) { if (cptr->info->type == pvr2_ctl_bitmask) {
mask &= cptr->info->def.type_bitmask.valid_bits; mask &= cptr->info->def.type_bitmask.valid_bits;
} else if (cptr->info->type == pvr2_ctl_int) { } else if (cptr->info->type == pvr2_ctl_int) {
...@@ -265,7 +265,7 @@ unsigned int pvr2_ctrl_get_v4lflags(struct pvr2_ctrl *cptr) ...@@ -265,7 +265,7 @@ unsigned int pvr2_ctrl_get_v4lflags(struct pvr2_ctrl *cptr)
int pvr2_ctrl_is_writable(struct pvr2_ctrl *cptr) int pvr2_ctrl_is_writable(struct pvr2_ctrl *cptr)
{ {
if (!cptr) return 0; if (!cptr) return 0;
return cptr->info->set_value != 0; return cptr->info->set_value != NULL;
} }
......
...@@ -2291,7 +2291,7 @@ static int pvr2_hdw_commit_setup(struct pvr2_hdw *hdw) ...@@ -2291,7 +2291,7 @@ static int pvr2_hdw_commit_setup(struct pvr2_hdw *hdw)
for (idx = 0; idx < hdw->control_cnt; idx++) { for (idx = 0; idx < hdw->control_cnt; idx++) {
cptr = hdw->controls + idx; cptr = hdw->controls + idx;
if (cptr->info->is_dirty == 0) continue; if (!cptr->info->is_dirty) continue;
if (!cptr->info->is_dirty(cptr)) continue; if (!cptr->info->is_dirty(cptr)) continue;
commit_flag = !0; commit_flag = !0;
...@@ -2646,7 +2646,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw, ...@@ -2646,7 +2646,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
u16 address; u16 address;
unsigned int pipe; unsigned int pipe;
LOCK_TAKE(hdw->big_lock); do { LOCK_TAKE(hdw->big_lock); do {
if ((hdw->fw_buffer == 0) == !enable_flag) break; if ((hdw->fw_buffer == NULL) == !enable_flag) break;
if (!enable_flag) { if (!enable_flag) {
pvr2_trace(PVR2_TRACE_FIRMWARE, pvr2_trace(PVR2_TRACE_FIRMWARE,
...@@ -2715,7 +2715,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw, ...@@ -2715,7 +2715,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
/* Return true if we're in a mode for retrieval CPU firmware */ /* Return true if we're in a mode for retrieval CPU firmware */
int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *hdw) int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *hdw)
{ {
return hdw->fw_buffer != 0; return hdw->fw_buffer != NULL;
} }
......
...@@ -563,7 +563,7 @@ void pvr2_stream_kill(struct pvr2_stream *sp) ...@@ -563,7 +563,7 @@ void pvr2_stream_kill(struct pvr2_stream *sp)
struct pvr2_buffer *bp; struct pvr2_buffer *bp;
mutex_lock(&sp->mutex); do { mutex_lock(&sp->mutex); do {
pvr2_stream_internal_flush(sp); pvr2_stream_internal_flush(sp);
while ((bp = pvr2_stream_get_ready_buffer(sp)) != 0) { while ((bp = pvr2_stream_get_ready_buffer(sp)) != NULL) {
pvr2_buffer_set_idle(bp); pvr2_buffer_set_idle(bp);
} }
if (sp->buffer_total_count != sp->buffer_target_count) { if (sp->buffer_total_count != sp->buffer_target_count) {
......
...@@ -165,7 +165,7 @@ static int pvr2_ioread_start(struct pvr2_ioread *cp) ...@@ -165,7 +165,7 @@ static int pvr2_ioread_start(struct pvr2_ioread *cp)
if (!(cp->stream)) return 0; if (!(cp->stream)) return 0;
pvr2_trace(PVR2_TRACE_START_STOP, pvr2_trace(PVR2_TRACE_START_STOP,
"/*---TRACE_READ---*/ pvr2_ioread_start id=%p",cp); "/*---TRACE_READ---*/ pvr2_ioread_start id=%p",cp);
while ((bp = pvr2_stream_get_idle_buffer(cp->stream)) != 0) { while ((bp = pvr2_stream_get_idle_buffer(cp->stream)) != NULL) {
stat = pvr2_buffer_queue(bp); stat = pvr2_buffer_queue(bp);
if (stat < 0) { if (stat < 0) {
pvr2_trace(PVR2_TRACE_DATA_FLOW, pvr2_trace(PVR2_TRACE_DATA_FLOW,
......
...@@ -915,7 +915,7 @@ static void pwc_iso_stop(struct pwc_device *pdev) ...@@ -915,7 +915,7 @@ static void pwc_iso_stop(struct pwc_device *pdev)
struct urb *urb; struct urb *urb;
urb = pdev->sbuf[i].urb; urb = pdev->sbuf[i].urb;
if (urb != 0) { if (urb) {
PWC_DEBUG_MEMORY("Unlinking URB %p\n", urb); PWC_DEBUG_MEMORY("Unlinking URB %p\n", urb);
usb_kill_urb(urb); usb_kill_urb(urb);
} }
...@@ -931,7 +931,7 @@ static void pwc_iso_free(struct pwc_device *pdev) ...@@ -931,7 +931,7 @@ static void pwc_iso_free(struct pwc_device *pdev)
struct urb *urb; struct urb *urb;
urb = pdev->sbuf[i].urb; urb = pdev->sbuf[i].urb;
if (urb != 0) { if (urb) {
PWC_DEBUG_MEMORY("Freeing URB\n"); PWC_DEBUG_MEMORY("Freeing URB\n");
usb_free_urb(urb); usb_free_urb(urb);
pdev->sbuf[i].urb = NULL; pdev->sbuf[i].urb = NULL;
...@@ -1759,8 +1759,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id ...@@ -1759,8 +1759,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
/* Allocate video_device structure */ /* Allocate video_device structure */
pdev->vdev = video_device_alloc(); pdev->vdev = video_device_alloc();
if (pdev->vdev == 0) if (!pdev->vdev) {
{
PWC_ERROR("Err, cannot allocate video_device struture. Failing probe."); PWC_ERROR("Err, cannot allocate video_device struture. Failing probe.");
kfree(pdev); kfree(pdev);
return -ENOMEM; return -ENOMEM;
......
...@@ -488,7 +488,7 @@ saa7110_detect_client (struct i2c_adapter *adapter, ...@@ -488,7 +488,7 @@ saa7110_detect_client (struct i2c_adapter *adapter,
return 0; return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0) if (!client)
return -ENOMEM; return -ENOMEM;
client->addr = address; client->addr = address;
client->adapter = adapter; client->adapter = adapter;
...@@ -496,7 +496,7 @@ saa7110_detect_client (struct i2c_adapter *adapter, ...@@ -496,7 +496,7 @@ saa7110_detect_client (struct i2c_adapter *adapter,
strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client))); strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL); decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL);
if (decoder == 0) { if (!decoder) {
kfree(client); kfree(client);
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -502,7 +502,7 @@ saa7111_detect_client (struct i2c_adapter *adapter, ...@@ -502,7 +502,7 @@ saa7111_detect_client (struct i2c_adapter *adapter,
return 0; return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0) if (!client)
return -ENOMEM; return -ENOMEM;
client->addr = address; client->addr = address;
client->adapter = adapter; client->adapter = adapter;
......
...@@ -841,7 +841,7 @@ saa7114_detect_client (struct i2c_adapter *adapter, ...@@ -841,7 +841,7 @@ saa7114_detect_client (struct i2c_adapter *adapter,
return 0; return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0) if (!client)
return -ENOMEM; return -ENOMEM;
client->addr = address; client->addr = address;
client->adapter = adapter; client->adapter = adapter;
......
...@@ -403,7 +403,7 @@ saa7185_detect_client (struct i2c_adapter *adapter, ...@@ -403,7 +403,7 @@ saa7185_detect_client (struct i2c_adapter *adapter,
return 0; return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0) if (!client)
return -ENOMEM; return -ENOMEM;
client->addr = address; client->addr = address;
client->adapter = adapter; client->adapter = adapter;
......
...@@ -172,7 +172,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -172,7 +172,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
/* allocate memory for client structure */ /* allocate memory for client structure */
client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (0 == client) { if (!client) {
printk("not enough kernel memory\n"); printk("not enough kernel memory\n");
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -64,7 +64,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -64,7 +64,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
/* allocate memory for client structure */ /* allocate memory for client structure */
client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (0 == client) { if (!client) {
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -101,7 +101,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -101,7 +101,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
/* allocate memory for client structure */ /* allocate memory for client structure */
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (0 == client) { if (!client) {
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -1072,12 +1072,12 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter, ...@@ -1072,12 +1072,12 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
return 0; return 0;
c = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); c = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (c == 0) if (!c)
return -ENOMEM; return -ENOMEM;
memcpy(c, &client_template, sizeof(struct i2c_client)); memcpy(c, &client_template, sizeof(struct i2c_client));
core = kzalloc(sizeof(struct tvp5150), GFP_KERNEL); core = kzalloc(sizeof(struct tvp5150), GFP_KERNEL);
if (core == 0) { if (!core) {
kfree(c); kfree(c);
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -339,7 +339,7 @@ v4l_fbuffer_alloc (struct file *file) ...@@ -339,7 +339,7 @@ v4l_fbuffer_alloc (struct file *file)
/* Use kmalloc */ /* Use kmalloc */
mem = kmalloc(fh->v4l_buffers.buffer_size, GFP_KERNEL); mem = kmalloc(fh->v4l_buffers.buffer_size, GFP_KERNEL);
if (mem == 0) { if (!mem) {
dprintk(1, dprintk(1,
KERN_ERR KERN_ERR
"%s: v4l_fbuffer_alloc() - kmalloc for V4L buf %d failed\n", "%s: v4l_fbuffer_alloc() - kmalloc for V4L buf %d failed\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment