V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16

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

diff --git a/drivers/media/dvb/frontends/drx397xD.h b/drivers/media/dvb/frontends/drx397xD.h
index ddc7a07971b73473c4c9fd428f9a038a2768fe0c..ba05d17290c633e51fdc30e0dc0055d9702affeb 100644 (file)
--- a/drivers/media/dvb/frontends/drx397xD.h
+++ b/drivers/media/dvb/frontends/drx397xD.h
@@ -28,7 +28,7 @@
 #define DRX_F_OFFSET   36000000
 
 #define I2C_ADR_C0(x) \
-(      (u32)cpu_to_le32( \
+(      cpu_to_le32( \
                (u32)( \
                        (((u32)(x) & (u32)0x000000ffUL)      ) | \
                        (((u32)(x) & (u32)0x0000ff00UL) << 16) | \
@@ -38,7 +38,7 @@
 )
 
 #define I2C_ADR_E0(x) \
-(      (u32)cpu_to_le32( \
+(      cpu_to_le32( \
                (u32)( \
                        (((u32)(x) & (u32)0x000000ffUL)      ) | \
                        (((u32)(x) & (u32)0x0000ff00UL) << 16) | \
@@ -122,7 +122,7 @@ extern struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config
 static inline struct dvb_frontend* drx397xD_attach(const struct drx397xD_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_DRX397XD */