Merge branch 'topic/cleanup' into for-linus

[pandora-kernel.git] / drivers / media / dvb / frontends / ves1820.c

diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 8791701..6e78e48 100644 (file)
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -66,7 +66,7 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data)
 
        if (ret != 1)
                printk("ves1820: %s(): writereg error (reg == 0x%02x, "
-                       "val == 0x%02x, ret == %i)\n", __FUNCTION__, reg, data, ret);
+                       "val == 0x%02x, ret == %i)\n", __func__, reg, data, ret);
 
        return (ret != 1) ? -EREMOTEIO : 0;
 }
@@ -85,7 +85,7 @@ static u8 ves1820_readreg(struct ves1820_state *state, u8 reg)
 
        if (ret != 2)
                printk("ves1820: %s(): readreg error (reg == 0x%02x, "
-               "ret == %i)\n", __FUNCTION__, reg, ret);
+               "ret == %i)\n", __func__, reg, ret);
 
        return b1[0];
 }
@@ -374,7 +374,7 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
        struct ves1820_state* state = NULL;
 
        /* allocate memory for the internal state */
-       state = kmalloc(sizeof(struct ves1820_state), GFP_KERNEL);
+       state = kzalloc(sizeof(struct ves1820_state), GFP_KERNEL);
        if (state == NULL)
                goto error;