UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] video/saa7164: Fix sparse warning: Using plain integer as NULL pointer 

This patch fixes the warning "Using plain integer as NULL pointer",
generated by sparse, by replacing
	if (var == 0)
with
	if (!var)
after an allocation
and all other offending 0s with NULL.

KernelVersion: linus' tree-1f0324c

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Peter Huewe 2011-01-30 16:33:01 -03:00 committed by Mauro Carvalho Chehab
parent 7ee9e64a3d
commit 61ca1500c5
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/saa7164/saa7164-api.c
View File

@ -743,7 +743,7 @@ int saa7164_api_configure_dif(struct saa7164_port *port, u32 std)
int saa7164_api_initialize_dif(struct saa7164_port *port) int saa7164_api_initialize_dif(struct saa7164_port *port)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
struct saa7164_port *p = 0; struct saa7164_port *p = NULL;
int ret = -EINVAL; int ret = -EINVAL;
u32 std = 0; u32 std = 0;
@ -926,9 +926,9 @@ int saa7164_api_configure_port_mpeg2ps(struct saa7164_dev *dev,
int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len) int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
{ {
struct saa7164_port *tsport = 0; struct saa7164_port *tsport = NULL;
struct saa7164_port *encport = 0; struct saa7164_port *encport = NULL;
struct saa7164_port *vbiport = 0; struct saa7164_port *vbiport = NULL;
u32 idx, next_offset; u32 idx, next_offset;
int i; int i;
struct tmComResDescrHeader *hdr, *t; struct tmComResDescrHeader *hdr, *t;
@ -1340,7 +1340,7 @@ int saa7164_api_enum_subdevs(struct saa7164_dev *dev)
/* Allocate enough storage for all of the descs */ /* Allocate enough storage for all of the descs */
buf = kzalloc(buflen, GFP_KERNEL); buf = kzalloc(buflen, GFP_KERNEL);
if (buf == NULL) if (!buf)
return SAA_ERR_NO_RESOURCES; return SAA_ERR_NO_RESOURCES;
/* Retrieve them */ /* Retrieve them */

16
drivers/media/video/saa7164/saa7164-buffer.c
View File

@ -93,7 +93,7 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
u32 len) u32 len)
{ {
struct tmHWStreamParameters *params = &port->hw_streamingparams; struct tmHWStreamParameters *params = &port->hw_streamingparams;
struct saa7164_buffer *buf = 0; struct saa7164_buffer *buf = NULL;
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int i; int i;
@ -103,7 +103,7 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
} }
buf = kzalloc(sizeof(struct saa7164_buffer), GFP_KERNEL); buf = kzalloc(sizeof(struct saa7164_buffer), GFP_KERNEL);
if (buf == NULL) { if (!buf) {
log_warn("%s() SAA_ERR_NO_RESOURCES\n", __func__); log_warn("%s() SAA_ERR_NO_RESOURCES\n", __func__);
goto ret; goto ret;
} }
@ -157,7 +157,7 @@ fail2:
fail1: fail1:
kfree(buf); kfree(buf);
buf = 0; buf = NULL;
ret: ret:
return buf; return buf;
} }
@ -289,14 +289,14 @@ struct saa7164_user_buffer *saa7164_buffer_alloc_user(struct saa7164_dev *dev,
struct saa7164_user_buffer *buf; struct saa7164_user_buffer *buf;
buf = kzalloc(sizeof(struct saa7164_user_buffer), GFP_KERNEL); buf = kzalloc(sizeof(struct saa7164_user_buffer), GFP_KERNEL);
if (buf == 0) if (!buf)
return 0; return NULL;
buf->data = kzalloc(len, GFP_KERNEL); buf->data = kzalloc(len, GFP_KERNEL);
if (buf->data == 0) { if (!buf->data) {
kfree(buf); kfree(buf);
return 0; return NULL;
} }
buf->actual_size = len; buf->actual_size = len;
@ -315,7 +315,7 @@ void saa7164_buffer_dealloc_user(struct saa7164_user_buffer *buf)
return; return;
kfree(buf->data); kfree(buf->data);
buf->data = 0; buf->data = NULL;
kfree(buf); kfree(buf);
} }

8
drivers/media/video/saa7164/saa7164-bus.c
View File

@ -158,7 +158,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
return SAA_ERR_BAD_PARAMETER; return SAA_ERR_BAD_PARAMETER;
} }
if ((msg->size > 0) && (buf == 0)) { if ((msg->size > 0) && (buf == NULL)) {
printk(KERN_ERR "%s() Missing message buffer\n", __func__); printk(KERN_ERR "%s() Missing message buffer\n", __func__);
return SAA_ERR_BAD_PARAMETER; return SAA_ERR_BAD_PARAMETER;
} }
@ -315,7 +315,7 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
saa7164_bus_verify(dev); saa7164_bus_verify(dev);
if (msg == 0) if (msg == NULL)
return ret; return ret;
if (msg->size > dev->bus.m_wMaxReqSize) { if (msg->size > dev->bus.m_wMaxReqSize) {
@ -324,7 +324,7 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
return ret; return ret;
} }
if ((peekonly == 0) && (msg->size > 0) && (buf == 0)) { if ((peekonly == 0) && (msg->size > 0) && (buf == NULL)) {
printk(KERN_ERR printk(KERN_ERR
"%s() Missing msg buf, size should be %d bytes\n", "%s() Missing msg buf, size should be %d bytes\n",
__func__, msg->size); __func__, msg->size);
@ -392,7 +392,7 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
printk(KERN_ERR "%s() Unexpected msg miss-match\n", __func__); printk(KERN_ERR "%s() Unexpected msg miss-match\n", __func__);
saa7164_bus_dumpmsg(dev, msg, buf); saa7164_bus_dumpmsg(dev, msg, buf);
saa7164_bus_dumpmsg(dev, &msg_tmp, 0); saa7164_bus_dumpmsg(dev, &msg_tmp, NULL);
ret = SAA_ERR_INVALID_COMMAND; ret = SAA_ERR_INVALID_COMMAND;
goto out; goto out;
} }

10
drivers/media/video/saa7164/saa7164-cmd.c
View File

@ -84,7 +84,7 @@ int saa7164_irq_dequeue(struct saa7164_dev *dev)
{ {
int ret = SAA_OK, i = 0; int ret = SAA_OK, i = 0;
u32 timeout; u32 timeout;
wait_queue_head_t *q = 0; wait_queue_head_t *q = NULL;
u8 tmp[512]; u8 tmp[512];
dprintk(DBGLVL_CMD, "%s()\n", __func__); dprintk(DBGLVL_CMD, "%s()\n", __func__);
@ -137,7 +137,7 @@ int saa7164_cmd_dequeue(struct saa7164_dev *dev)
int loop = 1; int loop = 1;
int ret; int ret;
u32 timeout; u32 timeout;
wait_queue_head_t *q = 0; wait_queue_head_t *q = NULL;
u8 tmp[512]; u8 tmp[512];
dprintk(DBGLVL_CMD, "%s()\n", __func__); dprintk(DBGLVL_CMD, "%s()\n", __func__);
@ -261,7 +261,7 @@ out:
*/ */
int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
{ {
wait_queue_head_t *q = 0; wait_queue_head_t *q = NULL;
int ret = SAA_BUS_TIMEOUT; int ret = SAA_BUS_TIMEOUT;
unsigned long stamp; unsigned long stamp;
int r; int r;
@ -357,7 +357,7 @@ int saa7164_cmd_send(struct saa7164_dev *dev, u8 id, enum tmComResCmd command,
"sel = 0x%x)\n", __func__, saa7164_unitid_name(dev, id), id, "sel = 0x%x)\n", __func__, saa7164_unitid_name(dev, id), id,
command, controlselector); command, controlselector);
if ((size == 0) || (buf == 0)) { if ((size == 0) || (buf == NULL)) {
printk(KERN_ERR "%s() Invalid param\n", __func__); printk(KERN_ERR "%s() Invalid param\n", __func__);
return SAA_ERR_BAD_PARAMETER; return SAA_ERR_BAD_PARAMETER;
} }
@ -538,7 +538,7 @@ int saa7164_cmd_send(struct saa7164_dev *dev, u8 id, enum tmComResCmd command,
/* Invalid */ /* Invalid */
dprintk(DBGLVL_CMD, "%s() Invalid\n", __func__); dprintk(DBGLVL_CMD, "%s() Invalid\n", __func__);
ret = saa7164_bus_get(dev, presponse_t, 0, 0); ret = saa7164_bus_get(dev, presponse_t, NULL, 0);
if (ret != SAA_OK) { if (ret != SAA_OK) {
printk(KERN_ERR "get failed\n"); printk(KERN_ERR "get failed\n");
return ret; return ret;

8
drivers/media/video/saa7164/saa7164-core.c
View File

@ -277,8 +277,8 @@ static void saa7164_histogram_print(struct saa7164_port *port,
static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr) static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
struct saa7164_buffer *buf = 0; struct saa7164_buffer *buf = NULL;
struct saa7164_user_buffer *ubuf = 0; struct saa7164_user_buffer *ubuf = NULL;
struct list_head *c, *n; struct list_head *c, *n;
int i = 0; int i = 0;
u8 __iomem *p; u8 __iomem *p;
@ -649,7 +649,7 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id)
u32 intid, intstat[INT_SIZE/4]; u32 intid, intstat[INT_SIZE/4];
int i, handled = 0, bit; int i, handled = 0, bit;
if (dev == 0) { if (dev == NULL) {
printk(KERN_ERR "%s() No device specified\n", __func__); printk(KERN_ERR "%s() No device specified\n", __func__);
handled = 0; handled = 0;
goto out; goto out;
@ -945,7 +945,7 @@ static int get_resources(struct saa7164_dev *dev)
static int saa7164_port_init(struct saa7164_dev *dev, int portnr) static int saa7164_port_init(struct saa7164_dev *dev, int portnr)
{ {
struct saa7164_port *port = 0; struct saa7164_port *port = NULL;
if ((portnr < 0) || (portnr >= SAA7164_MAX_PORTS)) if ((portnr < 0) || (portnr >= SAA7164_MAX_PORTS))
BUG(); BUG();

4
drivers/media/video/saa7164/saa7164-dvb.c
View File

@ -309,8 +309,8 @@ static int dvb_register(struct saa7164_port *port)
port->hw_streamingparams.pitch = 188; port->hw_streamingparams.pitch = 188;
port->hw_streamingparams.linethreshold = 0; port->hw_streamingparams.linethreshold = 0;
port->hw_streamingparams.pagetablelistvirt = 0; port->hw_streamingparams.pagetablelistvirt = NULL;
port->hw_streamingparams.pagetablelistphys = 0; port->hw_streamingparams.pagetablelistphys = NULL;
port->hw_streamingparams.numpagetables = 2 + port->hw_streamingparams.numpagetables = 2 +
((SAA7164_TS_NUMBER_OF_LINES * 188) / PAGE_SIZE); ((SAA7164_TS_NUMBER_OF_LINES * 188) / PAGE_SIZE);

8
drivers/media/video/saa7164/saa7164-encoder.c
View File

@ -152,8 +152,8 @@ static int saa7164_encoder_buffers_alloc(struct saa7164_port *port)
/* Init and establish defaults */ /* Init and establish defaults */
params->bitspersample = 8; params->bitspersample = 8;
params->linethreshold = 0; params->linethreshold = 0;
params->pagetablelistvirt = 0; params->pagetablelistvirt = NULL;
params->pagetablelistphys = 0; params->pagetablelistphys = NULL;
params->numpagetableentries = port->hwcfg.buffercount; params->numpagetableentries = port->hwcfg.buffercount;
/* Allocate the PCI resources, buffers (hard) */ /* Allocate the PCI resources, buffers (hard) */
@ -1108,7 +1108,7 @@ static int fops_release(struct file *file)
struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port) struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port)
{ {
struct saa7164_user_buffer *ubuf = 0; struct saa7164_user_buffer *ubuf = NULL;
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
u32 crc; u32 crc;
@ -1443,7 +1443,7 @@ int saa7164_encoder_register(struct saa7164_port *port)
port->v4l_device = saa7164_encoder_alloc(port, port->v4l_device = saa7164_encoder_alloc(port,
dev->pci, &saa7164_mpeg_template, "mpeg"); dev->pci, &saa7164_mpeg_template, "mpeg");
if (port->v4l_device == NULL) { if (!port->v4l_device) {
printk(KERN_INFO "%s: can't allocate mpeg device\n", printk(KERN_INFO "%s: can't allocate mpeg device\n",
dev->name); dev->name);
result = -ENOMEM; result = -ENOMEM;

2
drivers/media/video/saa7164/saa7164-fw.c
View File

@ -88,7 +88,7 @@ int saa7164_downloadimage(struct saa7164_dev *dev, u8 *src, u32 srcsize,
"%s(image=%p, size=%d, flags=0x%x, dst=%p, dstsize=0x%x)\n", "%s(image=%p, size=%d, flags=0x%x, dst=%p, dstsize=0x%x)\n",
__func__, src, srcsize, dlflags, dst, dstsize); __func__, src, srcsize, dlflags, dst, dstsize);
if ((src == 0) || (dst == 0)) { if ((src == NULL) || (dst == NULL)) {
ret = -EIO; ret = -EIO;
goto out; goto out;
} }

8
drivers/media/video/saa7164/saa7164-vbi.c
View File

@ -123,8 +123,8 @@ static int saa7164_vbi_buffers_alloc(struct saa7164_port *port)
((params->numberoflines * params->pitch) / PAGE_SIZE); ((params->numberoflines * params->pitch) / PAGE_SIZE);
params->bitspersample = 8; params->bitspersample = 8;
params->linethreshold = 0; params->linethreshold = 0;
params->pagetablelistvirt = 0; params->pagetablelistvirt = NULL;
params->pagetablelistphys = 0; params->pagetablelistphys = NULL;
params->numpagetableentries = port->hwcfg.buffercount; params->numpagetableentries = port->hwcfg.buffercount;
/* Allocate the PCI resources, buffers (hard) */ /* Allocate the PCI resources, buffers (hard) */
@ -1054,7 +1054,7 @@ static int fops_release(struct file *file)
struct saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port) struct saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port)
{ {
struct saa7164_user_buffer *ubuf = 0; struct saa7164_user_buffer *ubuf = NULL;
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
u32 crc; u32 crc;
@ -1334,7 +1334,7 @@ int saa7164_vbi_register(struct saa7164_port *port)
port->v4l_device = saa7164_vbi_alloc(port, port->v4l_device = saa7164_vbi_alloc(port,
dev->pci, &saa7164_vbi_template, "vbi"); dev->pci, &saa7164_vbi_template, "vbi");
if (port->v4l_device == NULL) { if (!port->v4l_device) {
printk(KERN_INFO "%s: can't allocate vbi device\n", printk(KERN_INFO "%s: can't allocate vbi device\n",
dev->name); dev->name);
result = -ENOMEM; result = -ENOMEM;