From 0be6d583d9e47196cfb423dd6b1ee4577caf3bd4 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Tue, 22 Jun 2004 14:36:41 +0000 Subject: - beautify error and debug messages --- linux/drivers/media/dvb/frontends/stv0299.c | 31 ++++++++++------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c index 7da577ea7..09f6f0119 100644 --- a/linux/drivers/media/dvb/frontends/stv0299.c +++ b/linux/drivers/media/dvb/frontends/stv0299.c @@ -1275,27 +1275,21 @@ static long probe_tuner (struct i2c_adapter *adapter) stv0299_writereg (i2c, 0x03, 0x00); - printk ("%s: try to attach to %s\n", __FUNCTION__, adapter->name); - - // FIXME: Can't we bring some sort of ID in here? - // adapter->id? - if ( strcmp(adapter->name, "Technisat SkyStar2 driver") == 0 ) - { - printk ("%s: setup for tuner Samsung TBMU24112IMB\n", __FILE__); + printk("stv0299: try to attach to %s\n", adapter->name); + if (!strcmp(adapter->name, "Technisat SkyStar2 driver")) { + printk ("stv0299: setup for tuner Samsung TBMU24112IMB\n"); return SAMSUNG_TBMU24112IMB; } if ((ret = i2c_transfer(i2c, msg1, 2)) == 2) { if ( strcmp(adapter->name, "TT-Budget/WinTV-NOVA-CI PCI") == 0 ) { // technotrend cards require non-datasheet settings - printk ("%s: setup for tuner SU1278 (TSA5059 synth) on" - " TechnoTrend hardware\n", __FILE__); + printk ("stv0299: setup for tuner SU1278 (TSA5059 synth) on TechnoTrend hardware\n"); return PHILIPS_SU1278_TSA_TT; } else { // fall back to datasheet-recommended settings - printk ("%s: setup for tuner SU1278 (TSA5059 synth)\n", - __FILE__); + printk ("stv0299: setup for tuner SU1278 (TSA5059 synth)\n"); return PHILIPS_SU1278_TSA; } } @@ -1304,17 +1298,15 @@ static long probe_tuner (struct i2c_adapter *adapter) if ( strcmp(adapter->name, "KNC1 DVB-S") == 0 ) { // Typhoon cards have unusual wiring. - printk ("%s: setup for tuner SU1278 (TSA5059 synth) on" - " Typhoon hardware\n", __FILE__); + printk ("stv0299: setup for tuner SU1278 (TSA5059 synth) on Typhoon hardware\n"); return PHILIPS_SU1278_TSA_TY; } //else if ((stat[0] & 0x3f) == 0) { else if (0) { - printk ("%s: setup for tuner TDQF-S001F\n", __FILE__); + printk ("stv0299: setup for tuner TDQF-S001F\n"); return LG_TDQF_S001F; } else { - printk ("%s: setup for tuner BSRU6, TDQB-S00x\n", - __FILE__); + printk ("stv0299: setup for tuner BSRU6, TDQB-S00x\n"); return ALPS_BSRU6; } } @@ -1325,14 +1317,11 @@ static long probe_tuner (struct i2c_adapter *adapter) stv0299_writereg (i2c, 0x02, 0x00); if ((ret = i2c_transfer(i2c, msg3, 2)) == 2) { - printk ("%s: setup for tuner Philips SU1278 (TUA6100 synth)\n", - __FILE__); + printk ("stv0299: setup for tuner Philips SU1278 (TUA6100 synth)\n"); return PHILIPS_SU1278_TUA; } - printk ("%s: unknown PLL synthesizer (ret == %i), " - "please report to !!\n", - __FILE__, ret); + printk ("stv0299: unknown PLL synthesizer (ret == %i), please report to !!\n", ret); return UNKNOWN_FRONTEND; } -- cgit v1.2.3