diff options
Diffstat (limited to 'drivers/media/common/b2c2')
| -rw-r--r-- | drivers/media/common/b2c2/flexcop-common.h | 1 | ||||
| -rw-r--r-- | drivers/media/common/b2c2/flexcop-eeprom.c | 3 | ||||
| -rw-r--r-- | drivers/media/common/b2c2/flexcop-i2c.c | 14 | ||||
| -rw-r--r-- | drivers/media/common/b2c2/flexcop-misc.c | 9 | ||||
| -rw-r--r-- | drivers/media/common/b2c2/flexcop.c | 3 |
5 files changed, 12 insertions, 18 deletions
diff --git a/drivers/media/common/b2c2/flexcop-common.h b/drivers/media/common/b2c2/flexcop-common.h index 2b2460e9e6b4..2533574c0cf4 100644 --- a/drivers/media/common/b2c2/flexcop-common.h +++ b/drivers/media/common/b2c2/flexcop-common.h @@ -14,7 +14,6 @@ #include "dmxdev.h" #include "dvb_demux.h" -#include "dvb_filter.h" #include "dvb_net.h" #include "dvb_frontend.h" diff --git a/drivers/media/common/b2c2/flexcop-eeprom.c b/drivers/media/common/b2c2/flexcop-eeprom.c index a25373a9bd84..844c7836c2a6 100644 --- a/drivers/media/common/b2c2/flexcop-eeprom.c +++ b/drivers/media/common/b2c2/flexcop-eeprom.c @@ -136,8 +136,7 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended) if ((ret = flexcop_eeprom_lrc_read(fc,0x3f8,buf,8,4)) == 0) { if (extended != 0) { - err("TODO: extended (EUI64) MAC addresses aren't " - "completely supported yet"); + err("TODO: extended (EUI64) MAC addresses aren't completely supported yet"); ret = -EINVAL; } else memcpy(fc->dvb_adapter.proposed_mac,buf,6); diff --git a/drivers/media/common/b2c2/flexcop-i2c.c b/drivers/media/common/b2c2/flexcop-i2c.c index 965d5eb33752..58d39a59fc09 100644 --- a/drivers/media/common/b2c2/flexcop-i2c.c +++ b/drivers/media/common/b2c2/flexcop-i2c.c @@ -33,8 +33,8 @@ static int flexcop_i2c_operation(struct flexcop_device *fc, return -EREMOTEIO; } } - deb_i2c("tried %d times i2c operation, " - "never finished or too many ack errors.\n", i); + deb_i2c("tried %d times i2c operation, never finished or too many ack errors.\n", + i); return -EREMOTEIO; } @@ -124,10 +124,10 @@ int flexcop_i2c_request(struct flexcop_i2c_adapter *i2c, #ifdef DUMP_I2C_MESSAGES printk(KERN_DEBUG "%d ", i2c->port); if (op == FC_READ) - printk("rd("); + printk(KERN_CONT "rd("); else - printk("wr("); - printk("%02x): %02x ", chipaddr, addr); + printk(KERN_CONT "wr("); + printk(KERN_CONT "%02x): %02x ", chipaddr, addr); #endif /* in that case addr is the only value -> @@ -151,7 +151,7 @@ int flexcop_i2c_request(struct flexcop_i2c_adapter *i2c, #ifdef DUMP_I2C_MESSAGES for (i = 0; i < bytes_to_transfer; i++) - printk("%02x ", buf[i]); + printk(KERN_CONT "%02x ", buf[i]); #endif if (ret < 0) @@ -163,7 +163,7 @@ int flexcop_i2c_request(struct flexcop_i2c_adapter *i2c, } #ifdef DUMP_I2C_MESSAGES - printk("\n"); + printk(KERN_CONT "\n"); #endif return 0; diff --git a/drivers/media/common/b2c2/flexcop-misc.c b/drivers/media/common/b2c2/flexcop-misc.c index b8eff235367d..bb0d95fe64f9 100644 --- a/drivers/media/common/b2c2/flexcop-misc.c +++ b/drivers/media/common/b2c2/flexcop-misc.c @@ -23,18 +23,15 @@ void flexcop_determine_revision(struct flexcop_device *fc) fc->rev = FLEXCOP_III; break; default: - err("unknown FlexCop Revision: %x. Please report this to " - "linux-dvb@linuxtv.org.", + err("unknown FlexCop Revision: %x. Please report this to linux-dvb@linuxtv.org.", v.misc_204.Rev_N_sig_revision_hi); break; } if ((fc->has_32_hw_pid_filter = v.misc_204.Rev_N_sig_caps)) - deb_info("this FlexCop has " - "the additional 32 hardware pid filter.\n"); + deb_info("this FlexCop has the additional 32 hardware pid filter.\n"); else - deb_info("this FlexCop has " - "the 6 basic main hardware pid filter.\n"); + deb_info("this FlexCop has the 6 basic main hardware pid filter.\n"); /* bus parts have to decide if hw pid filtering is used or not. */ } diff --git a/drivers/media/common/b2c2/flexcop.c b/drivers/media/common/b2c2/flexcop.c index 0f5114d406f8..4338ab0043b4 100644 --- a/drivers/media/common/b2c2/flexcop.c +++ b/drivers/media/common/b2c2/flexcop.c @@ -46,8 +46,7 @@ int b2c2_flexcop_debug; EXPORT_SYMBOL_GPL(b2c2_flexcop_debug); module_param_named(debug, b2c2_flexcop_debug, int, 0644); MODULE_PARM_DESC(debug, - "set debug level (1=info,2=tuner,4=i2c,8=ts," - "16=sram,32=reg (|-able))." + "set debug level (1=info,2=tuner,4=i2c,8=ts,16=sram,32=reg (|-able))." DEBSTATUS); #undef DEBSTATUS |