V4L/DVB (7514): media/dvb/frontends replace remaining __FUNCTION__ occurrences

[cascardo/linux.git] / drivers / media / dvb / frontends / bcm3510.c

diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index 1708a1d..d268e65 100644 (file)
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -33,7 +33,6 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/jiffies.h>
@@ -48,7 +47,6 @@
 struct bcm3510_state {
 
        struct i2c_adapter* i2c;
-       struct dvb_frontend_ops ops;
        const struct bcm3510_config* config;
        struct dvb_frontend frontend;
 
@@ -93,7 +91,7 @@ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8
        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
 
                deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n",
-                       __FUNCTION__, state->config->demod_address, reg,  err);
+                       __func__, state->config->demod_address, reg,  err);
                return -EREMOTEIO;
        }
 
@@ -112,7 +110,7 @@ static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 l
 
        if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
                deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n",
-                       __FUNCTION__, state->config->demod_address, reg,  err);
+                       __func__, state->config->demod_address, reg,  err);
                return -EREMOTEIO;
        }
        deb_i2c("i2c rd %02x: ",reg);
@@ -791,10 +789,9 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config,
 
        state->config = config;
        state->i2c = i2c;
-       memcpy(&state->ops, &bcm3510_ops, sizeof(struct dvb_frontend_ops));
 
        /* create dvb_frontend */
-       state->frontend.ops = &state->ops;
+       memcpy(&state->frontend.ops, &bcm3510_ops, sizeof(struct dvb_frontend_ops));
        state->frontend.demodulator_priv = state;
 
        mutex_init(&state->hab_mutex);