On Tue, 25 Jan 2011, Peter Huewe wrote:
> This patch fixes the warning "Using plain integer as NULL pointer",
> generated by sparse, by replacing the offending 0s with NULL.
I recall (a number of years ago) being told that for things like kmalloc,
the proper test was !x, not x == NULL.
julia
> KernelVersion: linus' tree-c723fdab
>
> Signed-off-by: Peter Huewe <peterhuewe@xxxxxx>
> ---
> drivers/media/video/saa7164/saa7164-api.c | 8 ++++----
> drivers/media/video/saa7164/saa7164-buffer.c | 14 +++++++-------
> drivers/media/video/saa7164/saa7164-bus.c | 8 ++++----
> drivers/media/video/saa7164/saa7164-cmd.c | 10 +++++-----
> drivers/media/video/saa7164/saa7164-core.c | 8 ++++----
> drivers/media/video/saa7164/saa7164-dvb.c | 4 ++--
> drivers/media/video/saa7164/saa7164-encoder.c | 6 +++---
> drivers/media/video/saa7164/saa7164-fw.c | 2 +-
> drivers/media/video/saa7164/saa7164-vbi.c | 6 +++---
> 9 files changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c
> index bd86d97..c49dcad 100644
> --- a/drivers/media/video/saa7164/saa7164-api.c
> +++ b/drivers/media/video/saa7164/saa7164-api.c
> @@ -743,7 +743,7 @@ int saa7164_api_configure_dif(struct saa7164_port *port, u32 std)
> int saa7164_api_initialize_dif(struct saa7164_port *port)
> {
> struct saa7164_dev *dev = port->dev;
> - struct saa7164_port *p = 0;
> + struct saa7164_port *p = NULL;
> int ret = -EINVAL;
> 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)
> {
> - struct saa7164_port *tsport = 0;
> - struct saa7164_port *encport = 0;
> - struct saa7164_port *vbiport = 0;
> + struct saa7164_port *tsport = NULL;
> + struct saa7164_port *encport = NULL;
> + struct saa7164_port *vbiport = NULL;
> u32 idx, next_offset;
> int i;
> struct tmComResDescrHeader *hdr, *t;
> diff --git a/drivers/media/video/saa7164/saa7164-buffer.c b/drivers/media/video/saa7164/saa7164-buffer.c
> index ddd2521..977062f 100644
> --- a/drivers/media/video/saa7164/saa7164-buffer.c
> +++ b/drivers/media/video/saa7164/saa7164-buffer.c
> @@ -93,7 +93,7 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
> u32 len)
> {
> struct tmHWStreamParameters *params = &port->hw_streamingparams;
> - struct saa7164_buffer *buf = 0;
> + struct saa7164_buffer *buf = NULL;
> struct saa7164_dev *dev = port->dev;
> int i;
>
> @@ -157,7 +157,7 @@ fail2:
> fail1:
> kfree(buf);
>
> - buf = 0;
> + buf = NULL;
> ret:
> return buf;
> }
> @@ -289,14 +289,14 @@ struct saa7164_user_buffer *saa7164_buffer_alloc_user(struct saa7164_dev *dev,
> struct saa7164_user_buffer *buf;
>
> buf = kzalloc(sizeof(struct saa7164_user_buffer), GFP_KERNEL);
> - if (buf == 0)
> - return 0;
> + if (buf == NULL)
> + return NULL;
>
> buf->data = kzalloc(len, GFP_KERNEL);
>
> - if (buf->data == 0) {
> + if (buf->data == NULL) {
> kfree(buf);
> - return 0;
> + return NULL;
> }
>
> buf->actual_size = len;
> @@ -315,7 +315,7 @@ void saa7164_buffer_dealloc_user(struct saa7164_user_buffer *buf)
> return;
>
> kfree(buf->data);
> - buf->data = 0;
> + buf->data = NULL;
>
> kfree(buf);
> }
> diff --git a/drivers/media/video/saa7164/saa7164-bus.c b/drivers/media/video/saa7164/saa7164-bus.c
> index b2b0d97..466e1b0 100644
> --- a/drivers/media/video/saa7164/saa7164-bus.c
> +++ b/drivers/media/video/saa7164/saa7164-bus.c
> @@ -158,7 +158,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
> 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__);
> return SAA_ERR_BAD_PARAMETER;
> }
> @@ -315,7 +315,7 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
>
> saa7164_bus_verify(dev);
>
> - if (msg == 0)
> + if (msg == NULL)
> return ret;
>
> if (msg->size > dev->bus.m_wMaxReqSize) {
> @@ -324,7 +324,7 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
> return ret;
> }
>
> - if ((peekonly == 0) && (msg->size > 0) && (buf == 0)) {
> + if ((peekonly == 0) && (msg->size > 0) && (buf == NULL)) {
> printk(KERN_ERR
> "%s() Missing msg buf, size should be %d bytes\n",
> __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__);
> 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;
> goto out;
> }
> diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
> index a97ae17..6a4c217 100644
> --- a/drivers/media/video/saa7164/saa7164-cmd.c
> +++ b/drivers/media/video/saa7164/saa7164-cmd.c
> @@ -84,7 +84,7 @@ int saa7164_irq_dequeue(struct saa7164_dev *dev)
> {
> int ret = SAA_OK, i = 0;
> u32 timeout;
> - wait_queue_head_t *q = 0;
> + wait_queue_head_t *q = NULL;
> u8 tmp[512];
> dprintk(DBGLVL_CMD, "%s()\n", __func__);
>
> @@ -137,7 +137,7 @@ int saa7164_cmd_dequeue(struct saa7164_dev *dev)
> int loop = 1;
> int ret;
> u32 timeout;
> - wait_queue_head_t *q = 0;
> + wait_queue_head_t *q = NULL;
> u8 tmp[512];
> dprintk(DBGLVL_CMD, "%s()\n", __func__);
>
> @@ -261,7 +261,7 @@ out:
> */
> 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;
> unsigned long stamp;
> 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,
> command, controlselector);
>
> - if ((size == 0) || (buf == 0)) {
> + if ((size == 0) || (buf == NULL)) {
> printk(KERN_ERR "%s() Invalid param\n", __func__);
> return SAA_ERR_BAD_PARAMETER;
> }
> @@ -538,7 +538,7 @@ int saa7164_cmd_send(struct saa7164_dev *dev, u8 id, enum tmComResCmd command,
>
> /* Invalid */
> 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) {
> printk(KERN_ERR "get failed\n");
> return ret;
> diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c
> index 58af67f..b813aec 100644
> --- a/drivers/media/video/saa7164/saa7164-core.c
> +++ b/drivers/media/video/saa7164/saa7164-core.c
> @@ -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)
> {
> struct saa7164_dev *dev = port->dev;
> - struct saa7164_buffer *buf = 0;
> - struct saa7164_user_buffer *ubuf = 0;
> + struct saa7164_buffer *buf = NULL;
> + struct saa7164_user_buffer *ubuf = NULL;
> struct list_head *c, *n;
> int i = 0;
> u8 __iomem *p;
> @@ -649,7 +649,7 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id)
> u32 intid, intstat[INT_SIZE/4];
> int i, handled = 0, bit;
>
> - if (dev == 0) {
> + if (dev == NULL) {
> printk(KERN_ERR "%s() No device specified\n", __func__);
> handled = 0;
> 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)
> {
> - struct saa7164_port *port = 0;
> + struct saa7164_port *port = NULL;
>
> if ((portnr < 0) || (portnr >= SAA7164_MAX_PORTS))
> BUG();
> diff --git a/drivers/media/video/saa7164/saa7164-dvb.c b/drivers/media/video/saa7164/saa7164-dvb.c
> index b305a01..f65eab6 100644
> --- a/drivers/media/video/saa7164/saa7164-dvb.c
> +++ b/drivers/media/video/saa7164/saa7164-dvb.c
> @@ -309,8 +309,8 @@ static int dvb_register(struct saa7164_port *port)
>
> port->hw_streamingparams.pitch = 188;
> port->hw_streamingparams.linethreshold = 0;
> - port->hw_streamingparams.pagetablelistvirt = 0;
> - port->hw_streamingparams.pagetablelistphys = 0;
> + port->hw_streamingparams.pagetablelistvirt = NULL;
> + port->hw_streamingparams.pagetablelistphys = NULL;
> port->hw_streamingparams.numpagetables = 2 +
> ((SAA7164_TS_NUMBER_OF_LINES * 188) / PAGE_SIZE);
>
> diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
> index 1838408..560a107 100644
> --- a/drivers/media/video/saa7164/saa7164-encoder.c
> +++ b/drivers/media/video/saa7164/saa7164-encoder.c
> @@ -152,8 +152,8 @@ static int saa7164_encoder_buffers_alloc(struct saa7164_port *port)
> /* Init and establish defaults */
> params->bitspersample = 8;
> params->linethreshold = 0;
> - params->pagetablelistvirt = 0;
> - params->pagetablelistphys = 0;
> + params->pagetablelistvirt = NULL;
> + params->pagetablelistphys = NULL;
> params->numpagetableentries = port->hwcfg.buffercount;
>
> /* 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 *ubuf = 0;
> + struct saa7164_user_buffer *ubuf = NULL;
> struct saa7164_dev *dev = port->dev;
> u32 crc;
>
> diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c
> index ebed6f7..b369300 100644
> --- a/drivers/media/video/saa7164/saa7164-fw.c
> +++ b/drivers/media/video/saa7164/saa7164-fw.c
> @@ -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",
> __func__, src, srcsize, dlflags, dst, dstsize);
>
> - if ((src == 0) || (dst == 0)) {
> + if ((src == NULL) || (dst == NULL)) {
> ret = -EIO;
> goto out;
> }
> diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
> index 8abbe6d..a659d3c 100644
> --- a/drivers/media/video/saa7164/saa7164-vbi.c
> +++ b/drivers/media/video/saa7164/saa7164-vbi.c
> @@ -123,8 +123,8 @@ static int saa7164_vbi_buffers_alloc(struct saa7164_port *port)
> ((params->numberoflines * params->pitch) / PAGE_SIZE);
> params->bitspersample = 8;
> params->linethreshold = 0;
> - params->pagetablelistvirt = 0;
> - params->pagetablelistphys = 0;
> + params->pagetablelistvirt = NULL;
> + params->pagetablelistphys = NULL;
> params->numpagetableentries = port->hwcfg.buffercount;
>
> /* 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 *ubuf = 0;
> + struct saa7164_user_buffer *ubuf = NULL;
> struct saa7164_dev *dev = port->dev;
> u32 crc;
>
> --
> 1.7.2.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
