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

[deliverable/linux.git] / drivers / media / dvb / frontends / mt312.h

diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h
index 7112fb4d58acb3a59db6c8313b9b83f309b71750..afe24fd822bd6123516e7ec956d8af7043011f8b 100644 (file)
--- a/drivers/media/dvb/frontends/mt312.h
+++ b/drivers/media/dvb/frontends/mt312.h
@@ -28,22 +28,21 @@
 
 #include <linux/dvb/frontend.h>
 
-struct mt312_config
-{
+struct mt312_config {
        /* the demodulator's i2c address */
        u8 demod_address;
 };
 
-#if defined(CONFIG_DVB_MT312) || defined(CONFIG_DVB_MT312_MODULE)
-struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
-                                       struct i2c_adapter* i2c);
+#if defined(CONFIG_DVB_MT312) || (defined(CONFIG_DVB_MT312_MODULE) && defined(MODULE))
+struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
+                                       struct i2c_adapter *i2c);
 #else
-static inline struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
-                                       struct i2c_adapter* i2c)
+static inline struct dvb_frontend *vp310_mt312_attach(
+       const struct mt312_config *config, struct i2c_adapter *i2c)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
-#endif // CONFIG_DVB_MT312
+#endif /* CONFIG_DVB_MT312 */
 
-#endif // MT312_H
+#endif /* MT312_H */