Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / frontends / cx24116.h

diff --git a/drivers/media/dvb/frontends/cx24116.h b/drivers/media/dvb/frontends/cx24116.h
index 8dbcec268394eb7030b8dcae1c45c5f55d78dfed..4cb3ddd6c6261f7ce3c15d96550b2c56832ce651 100644 (file)
--- a/drivers/media/dvb/frontends/cx24116.h
+++ b/drivers/media/dvb/frontends/cx24116.h
@@ -23,31 +23,32 @@
 
 #include <linux/dvb/frontend.h>
 
-struct cx24116_config
-{
+struct cx24116_config {
        /* the demodulator's i2c address */
        u8 demod_address;
 
        /* Need to set device param for start_dma */
-       int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
+       int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);
 
        /* Need to reset device during firmware loading */
-       int (*reset_device)(struct dvb_frontend* fe);
+       int (*reset_device)(struct dvb_frontend *fe);
 
        /* Need to set MPEG parameters */
        u8 mpg_clk_pos_pol:0x02;
 };
 
 #if defined(CONFIG_DVB_CX24116) || defined(CONFIG_DVB_CX24116_MODULE)
-extern struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
-                                          struct i2c_adapter* i2c);
+extern struct dvb_frontend *cx24116_attach(
+       const struct cx24116_config *config,
+       struct i2c_adapter *i2c);
 #else
-static inline struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
-                                                 struct i2c_adapter* i2c)
+static inline struct dvb_frontend *cx24116_attach(
+       const struct cx24116_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_CX24116
+#endif
 
 #endif /* CX24116_H */