V4L/DVB (3261): msp3400.c cleanup (almost all cosmetic)

- Step 1 of the msp3400.c cleanup.
Most changes are all cosmetic (moved code around, renamed functions
and variables).
New additions:
- VIDIOC_LOG_STATUS for debugging.
- More user friendly messages on driver load.
- 'simple' renamed to 'autodetect'
- 'simpler' renamed to 'autoselect'

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

1 files changed, 709 insertions, 697 deletions

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 11235c1ac5c..39058d3b2e6 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -59,21 +59,60 @@
 
 /* ---------------------------------------------------------------------- */
 
-#define I2C_MSP3400C       0x80
-#define I2C_MSP3400C_ALT   0x88
+MODULE_DESCRIPTION("device driver for msp34xx TV sound processor");
+MODULE_AUTHOR("Gerd Knorr");
+MODULE_LICENSE("GPL");
 
-#define I2C_MSP3400C_DEM   0x10
-#define I2C_MSP3400C_DFP   0x12
+#define OPMODE_AUTO       -1
+#define OPMODE_MANUAL      0
+#define OPMODE_AUTODETECT  1   /* use autodetect (>= msp3410 only) */
+#define OPMODE_AUTOSELECT  2   /* use autodetect & autoselect (>= msp34xxG)   */
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] = {
-	I2C_MSP3400C      >> 1,
-	I2C_MSP3400C_ALT  >> 1,
-	I2C_CLIENT_END
-};
-I2C_CLIENT_INSMOD;
+/* module parameters */
+static int opmode   = OPMODE_AUTO;
+static int debug    = 0;    /* debug output */
+static int once     = 0;    /* no continous stereo monitoring */
+static int amsound  = 0;    /* hard-wire AM sound at 6.5 Hz (france),
+			       the autoscan seems work well only with FM... */
+static int standard = 1;    /* Override auto detect of audio standard, if needed. */
+static int dolby    = 0;
+
+static int stereo_threshold = 0x190; /* a2 threshold for stereo/bilingual
+					(msp34xxg only) 0x00a0-0x03c0 */
 
-#define msp3400_dbg(fmt, arg...) \
+/* read-only */
+module_param(opmode,           int, 0444);
+
+/* read-write */
+module_param(once,             int, 0644);
+module_param(debug,            int, 0644);
+module_param(stereo_threshold, int, 0644);
+module_param(standard,         int, 0644);
+module_param(amsound,          int, 0644);
+module_param(dolby,            int, 0644);
+
+MODULE_PARM_DESC(opmode, "Forces a MSP3400 opmode. 0=Manual, 1=Autodetect, 2=Autodetect and autoselect");
+MODULE_PARM_DESC(once, "No continuous stereo monitoring");
+MODULE_PARM_DESC(debug, "Enable debug messages");
+MODULE_PARM_DESC(stereo_threshold, "Sets signal threshold to activate stereo");
+MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Default: Autodetect");
+MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan");
+MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
+
+/* ---------------------------------------------------------------------- */
+
+#define msp3400_err(fmt, arg...) do { \
+	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
+		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+#define msp3400_warn(fmt, arg...) do { \
+	printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->driver.name, \
+		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+#define msp3400_info(fmt, arg...) do { \
+	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
+		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+
+/* level 1 debug. */
+#define msp_dbg1(fmt, arg...) \
 	do { \
 		if (debug) \
 			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
@@ -81,8 +120,8 @@ I2C_CLIENT_INSMOD;
 			       i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
-/* Medium volume debug. */
-#define msp3400_dbg_mediumvol(fmt, arg...) \
+/* level 2 debug. */
+#define msp_dbg2(fmt, arg...) \
 	do { \
 		if (debug >= 2) \
 			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
@@ -90,8 +129,8 @@ I2C_CLIENT_INSMOD;
 				i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
-/* High volume debug. Use with care. */
-#define msp3400_dbg_highvol(fmt, arg...) \
+/* level 3 debug. Use with care. */
+#define msp_dbg3(fmt, arg...) \
 	do { \
 		if (debug >= 16) \
 			printk(KERN_INFO "%s debug %d-%04x: " fmt, \
@@ -99,45 +138,33 @@ I2C_CLIENT_INSMOD;
 				i2c_adapter_id(client->adapter), client->addr , ## arg); \
 	} while (0)
 
-#define msp3400_err(fmt, arg...) do { \
-	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
-		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
-#define msp3400_warn(fmt, arg...) do { \
-	printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->driver.name, \
-		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
-#define msp3400_info(fmt, arg...) do { \
-	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
-		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
+/* control subaddress */
+#define I2C_MSP_CONTROL 0x00
+/* demodulator unit subaddress */
+#define I2C_MSP_DEM     0x10
+/* DSP unit subaddress */
+#define I2C_MSP_DSP     0x12
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END };
+>>>>>>> remote
 
-#define OPMODE_AUTO    -1
-#define OPMODE_MANUAL   0
-#define OPMODE_SIMPLE   1   /* use short programming (>= msp3410 only) */
-#define OPMODE_SIMPLER  2   /* use shorter programming (>= msp34xxG)   */
 
-/* insmod parameters */
-static int opmode   = OPMODE_AUTO;
-static int debug    = 0;    /* debug output */
-static int once     = 0;    /* no continous stereo monitoring */
-static int amsound  = 0;    /* hard-wire AM sound at 6.5 Hz (france),
-			       the autoscan seems work well only with FM... */
-static int standard = 1;    /* Override auto detect of audio standard, if needed. */
-static int dolby    = 0;
+I2C_CLIENT_INSMOD;
 
-static int stereo_threshold = 0x190; /* a2 threshold for stereo/bilingual
-					(msp34xxg only) 0x00a0-0x03c0 */
 #define DFP_COUNT 0x41
 static const int bl_dfp[] = {
 	0x00, 0x01, 0x02, 0x03, 0x06, 0x08, 0x09, 0x0a,
 	0x0b, 0x0d, 0x0e, 0x10
 };
 
-#define IS_MSP34XX_G(msp) ((msp)->opmode==2)
+#define HAVE_NICAM(state)   (((state->rev2>>8) & 0xff) != 00)
+#define HAVE_RADIO(state)   ((state->rev1      & 0x0f) >= 'G'-'@')
 
-struct msp3400c {
-	int rev1,rev2;
+struct msp_state {
+	int rev1, rev2;
 
 	int opmode;
-	int nicam;
 	int mode;
 	int norm;
 	int stereo;
@@ -167,49 +194,19 @@ struct msp3400c {
 	int                  watch_stereo:1;
 };
 
-#define HAVE_NICAM(msp)   (((msp->rev2>>8) & 0xff) != 00)
-#define HAVE_SIMPLE(msp)  ((msp->rev1      & 0xff) >= 'D'-'@')
-#define HAVE_SIMPLER(msp) ((msp->rev1      & 0xff) >= 'G'-'@')
-#define HAVE_RADIO(msp)   ((msp->rev1      & 0xff) >= 'G'-'@')
-
 #define VIDEO_MODE_RADIO 16      /* norm magic for radio mode */
 
-/* ---------------------------------------------------------------------- */
-
-/* read-only */
-module_param(opmode,           int, 0444);
-
-/* read-write */
-module_param(once,             int, 0644);
-module_param(debug,            int, 0644);
-module_param(stereo_threshold, int, 0644);
-module_param(standard,         int, 0644);
-module_param(amsound,          int, 0644);
-module_param(dolby,            int, 0644);
-
-MODULE_PARM_DESC(opmode, "Forces a MSP3400 opmode. 0=Manual, 1=Simple, 2=Simpler");
-MODULE_PARM_DESC(once, "No continuous stereo monitoring");
-MODULE_PARM_DESC(debug, "Enable debug messages");
-MODULE_PARM_DESC(stereo_threshold, "Sets signal threshold to activate stereo");
-MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Default: Autodetect");
-MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan");
-MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
-
-
-MODULE_DESCRIPTION("device driver for msp34xx TV sound processor");
-MODULE_AUTHOR("Gerd Knorr");
-MODULE_LICENSE("GPL");
 
 /* ----------------------------------------------------------------------- */
 /* functions for talking to the MSP3400C Sound processor                   */
 
-static int msp3400c_reset(struct i2c_client *client)
+static int msp_reset(struct i2c_client *client)
 {
 	/* reset and read revision code */
-	static char reset_off[3] = { 0x00, 0x80, 0x00 };
-	static char reset_on[3]  = { 0x00, 0x00, 0x00 };
-	static char write[3]     = { I2C_MSP3400C_DFP + 1, 0x00, 0x1e };
-	char read[2];
+	static u8 reset_off[3] = { I2C_MSP_CONTROL, 0x80, 0x00 };
+	static u8 reset_on[3]  = { I2C_MSP_CONTROL, 0x00, 0x00 };
+	static u8 write[3]     = { I2C_MSP_DSP + 1, 0x00, 0x1e };
+	u8 read[2];
 	struct i2c_msg reset[2] = {
 		{ client->addr, I2C_M_IGNORE_NAK, 3, reset_off },
 		{ client->addr, I2C_M_IGNORE_NAK, 3, reset_on  },
@@ -219,54 +216,62 @@ static int msp3400c_reset(struct i2c_client *client)
 		{ client->addr, I2C_M_RD, 2, read  },
 	};
 
-	msp3400_dbg_highvol("msp3400c_reset\n");
-	if ( (1 != i2c_transfer(client->adapter,&reset[0],1)) ||
-	     (1 != i2c_transfer(client->adapter,&reset[1],1)) ||
-	     (2 != i2c_transfer(client->adapter,test,2)) ) {
-		msp3400_err("chip reset failed\n");
+	msp_dbg3("msp_reset\n");
+	if (1 != i2c_transfer(client->adapter, &reset[0], 1) ||
+	    1 != i2c_transfer(client->adapter, &reset[1], 1) ||
+	    2 != i2c_transfer(client->adapter, test, 2)) {
+		msp_err("chip reset failed\n");
 		return -1;
 	}
 	return 0;
 }
 
-static int msp3400c_read(struct i2c_client *client, int dev, int addr)
+static int msp_read(struct i2c_client *client, int dev, int addr)
 {
-	int err,retval;
-
-	unsigned char write[3];
-	unsigned char read[2];
+	int err, retval;
+	u8 write[3];
+	u8 read[2];
 	struct i2c_msg msgs[2] = {
 		{ client->addr, 0,        3, write },
 		{ client->addr, I2C_M_RD, 2, read  }
 	};
 
-	write[0] = dev+1;
+	write[0] = dev + 1;
 	write[1] = addr >> 8;
 	write[2] = addr & 0xff;
 
-	for (err = 0; err < 3;) {
-		if (2 == i2c_transfer(client->adapter,msgs,2))
+	for (err = 0; err < 3; err++) {
+		if (2 == i2c_transfer(client->adapter, msgs, 2))
 			break;
-		err++;
-		msp3400_warn("I/O error #%d (read 0x%02x/0x%02x)\n", err,
+		msp_warn("I/O error #%d (read 0x%02x/0x%02x)\n", err,
 		       dev, addr);
 		current->state = TASK_INTERRUPTIBLE;
 		schedule_timeout(msecs_to_jiffies(10));
 	}
 	if (3 == err) {
-		msp3400_warn("giving up, resetting chip. Sound will go off, sorry folks :-|\n");
-		msp3400c_reset(client);
+		msp_warn("giving up, resetting chip. Sound will go off, sorry folks :-|\n");
+		msp_reset(client);
 		return -1;
 	}
 	retval = read[0] << 8 | read[1];
-	msp3400_dbg_highvol("msp3400c_read(0x%x, 0x%x): 0x%x\n", dev, addr, retval);
+	msp_dbg3("msp_read(0x%x, 0x%x): 0x%x\n", dev, addr, retval);
 	return retval;
 }
 
-static int msp3400c_write(struct i2c_client *client, int dev, int addr, int val)
+static inline int msp_read_dem(struct i2c_client *client, int addr)
+{
+	return msp_read(client, I2C_MSP_DEM, addr);
+}
+
+static inline int msp_read_dsp(struct i2c_client *client, int addr)
+{
+	return msp_read(client, I2C_MSP_DSP, addr);
+}
+
+static int msp_write(struct i2c_client *client, int dev, int addr, int val)
 {
 	int err;
-	unsigned char buffer[5];
+	u8 buffer[5];
 
 	buffer[0] = dev;
 	buffer[1] = addr >> 8;
@@ -274,29 +279,38 @@ static int msp3400c_write(struct i2c_client *client, int dev, int addr, int val)
 	buffer[3] = val  >> 8;
 	buffer[4] = val  &  0xff;
 
-	msp3400_dbg_highvol("msp3400c_write(0x%x, 0x%x, 0x%x)\n", dev, addr, val);
-	for (err = 0; err < 3;) {
+	msp_dbg3("msp_write(0x%x, 0x%x, 0x%x)\n", dev, addr, val);
+	for (err = 0; err < 3; err++) {
 		if (5 == i2c_master_send(client, buffer, 5))
 			break;
-		err++;
-		msp3400_warn("I/O error #%d (write 0x%02x/0x%02x)\n", err,
+		msp_warn("I/O error #%d (write 0x%02x/0x%02x)\n", err,
 		       dev, addr);
 		current->state = TASK_INTERRUPTIBLE;
 		schedule_timeout(msecs_to_jiffies(10));
 	}
 	if (3 == err) {
-		msp3400_warn("giving up, reseting chip. Sound will go off, sorry folks :-|\n");
-		msp3400c_reset(client);
+		msp_warn("giving up, resetting chip. Sound will go off, sorry folks :-|\n");
+		msp_reset(client);
 		return -1;
 	}
 	return 0;
 }
 
+static inline int msp_write_dem(struct i2c_client *client, int addr, int val)
+{
+	return msp_write(client, I2C_MSP_DEM, addr, val);
+}
+
+static inline int msp_write_dsp(struct i2c_client *client, int addr, int val)
+{
+	return msp_write(client, I2C_MSP_DSP, addr, val);
+}
+
 /* ------------------------------------------------------------------------ */
 
 /* This macro is allowed for *constants* only, gcc must calculate it
    at compile time.  Remember -- no floats in kernel mode */
-#define MSP_CARRIER(freq) ((int)((float)(freq/18.432)*(1<<24)))
+#define MSP_CARRIER(freq) ((int)((float)(freq / 18.432) * (1 << 24)))
 
 #define MSP_MODE_AM_DETECT   0
 #define MSP_MODE_FM_RADIO    2
@@ -433,41 +447,41 @@ static char *scart_names[] = {
 	"mask", "in1", "in2", "in1 da", "in2 da", "in3", "in4", "mono", "mute"
 };
 
-static void msp3400c_set_scart(struct i2c_client *client, int in, int out)
+static void msp_set_scart(struct i2c_client *client, int in, int out)
 {
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 
-	msp->in_scart=in;
+	state->in_scart=in;
 
 	if (in >= 1 && in <= 8 && out >= 0 && out <= 2) {
 		if (-1 == scarts[out][in])
 			return;
 
-		msp->acb &= ~scarts[out][SCART_MASK];
-		msp->acb |=  scarts[out][in];
+		state->acb &= ~scarts[out][SCART_MASK];
+		state->acb |=  scarts[out][in];
 	} else
-		msp->acb = 0xf60; /* Mute Input and SCART 1 Output */
+		state->acb = 0xf60; /* Mute Input and SCART 1 Output */
 
-	msp3400_dbg("scart switch: %s => %d (ACB=0x%04x)\n",
-						scart_names[in], out, msp->acb);
-	msp3400c_write(client,I2C_MSP3400C_DFP, 0x13, msp->acb);
+	msp_dbg1("scart switch: %s => %d (ACB=0x%04x)\n",
+						scart_names[in], out, state->acb);
+	msp_write_dsp(client, 0x13, state->acb);
 
 	/* Sets I2S speed 0 = 1.024 Mbps, 1 = 2.048 Mbps */
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x40, msp->i2s_mode);
+	msp_write_dem(client, 0x40, state->i2s_mode);
 }
 
 /* ------------------------------------------------------------------------ */
 
 static void msp3400c_setcarrier(struct i2c_client *client, int cdo1, int cdo2)
 {
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x0093, cdo1 & 0xfff);
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x009b, cdo1 >> 12);
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x00a3, cdo2 & 0xfff);
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x00ab, cdo2 >> 12);
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x0056, 0); /*LOAD_REG_1/2*/
+	msp_write_dem(client, 0x0093, cdo1 & 0xfff);
+	msp_write_dem(client, 0x009b, cdo1 >> 12);
+	msp_write_dem(client, 0x00a3, cdo2 & 0xfff);
+	msp_write_dem(client, 0x00ab, cdo2 >> 12);
+	msp_write_dem(client, 0x0056, 0); /*LOAD_REG_1/2*/
 }
 
-static void msp3400c_setvolume(struct i2c_client *client,
+static void msp_set_volume(struct i2c_client *client,
 			       int muted, int left, int right)
  {
 	int vol = 0, val = 0, balance = 0;
@@ -480,91 +494,91 @@ static void msp3400c_setvolume(struct i2c_client *client,
 		balance = ((right - left) * 127) / vol;
 	}
 
-	msp3400_dbg("setvolume: mute=%s %d:%d  v=0x%02x b=0x%02x\n",
+	msp_dbg1("setvolume: mute=%s %d:%d  v=0x%02x b=0x%02x\n",
 		muted ? "on" : "off", left, right, val >> 8, balance);
-	msp3400c_write(client,I2C_MSP3400C_DFP, 0x0000, val); /* loudspeaker */
-	msp3400c_write(client,I2C_MSP3400C_DFP, 0x0006, val); /* headphones  */
-	msp3400c_write(client,I2C_MSP3400C_DFP, 0x0007,
+	msp_write_dsp(client, 0x0000, val); /* loudspeaker */
+	msp_write_dsp(client, 0x0006, val); /* headphones  */
+	msp_write_dsp(client, 0x0007,
 					muted ? 0x1 : (val | 0x1));
-	msp3400c_write(client, I2C_MSP3400C_DFP, 0x0001, balance << 8);
+	msp_write_dsp(client, 0x0001, balance << 8);
 }
 
-static void msp3400c_setbass(struct i2c_client *client, int bass)
+static void msp_set_bass(struct i2c_client *client, int bass)
 {
 	int val = ((bass-32768) * 0x60 / 65535) << 8;
 
-	msp3400_dbg("setbass: %d 0x%02x\n", bass, val >> 8);
-	msp3400c_write(client,I2C_MSP3400C_DFP, 0x0002, val); /* loudspeaker */
+	msp_dbg1("setbass: %d 0x%02x\n", bass, val >> 8);
+	msp_write_dsp(client, 0x0002, val); /* loudspeaker */
 }
 
-static void msp3400c_settreble(struct i2c_client *client, int treble)
+static void msp_set_treble(struct i2c_client *client, int treble)
 {
 	int val = ((treble-32768) * 0x60 / 65535) << 8;
 
-	msp3400_dbg("settreble: %d 0x%02x\n",treble, val>>8);
-	msp3400c_write(client,I2C_MSP3400C_DFP, 0x0003, val); /* loudspeaker */
+	msp_dbg1("settreble: %d 0x%02x\n",treble, val>>8);
+	msp_write_dsp(client, 0x0003, val); /* loudspeaker */
 }
 
 static void msp3400c_setmode(struct i2c_client *client, int type)
 {
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 	int i;
 
-	msp3400_dbg("setmode: %d\n",type);
-	msp->mode       = type;
-	msp->audmode    = V4L2_TUNER_MODE_MONO;
-	msp->rxsubchans = V4L2_TUNER_SUB_MONO;
+	msp_dbg1("setmode: %d\n",type);
+	state->mode       = type;
+	state->audmode    = V4L2_TUNER_MODE_MONO;
+	state->rxsubchans = V4L2_TUNER_SUB_MONO;
 
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x00bb,          /* ad_cv */
+	msp_write_dem(client, 0x00bb,          /* ad_cv */
 		       msp_init_data[type].ad_cv);
 
 	for (i = 5; i >= 0; i--)                                   /* fir 1 */
-		msp3400c_write(client,I2C_MSP3400C_DEM, 0x0001,
+		msp_write_dem(client, 0x0001,
 			       msp_init_data[type].fir1[i]);
 
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x0005, 0x0004); /* fir 2 */
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x0005, 0x0040);
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x0005, 0x0000);
+	msp_write_dem(client, 0x0005, 0x0004); /* fir 2 */
+	msp_write_dem(client, 0x0005, 0x0040);
+	msp_write_dem(client, 0x0005, 0x0000);
 	for (i = 5; i >= 0; i--)
-		msp3400c_write(client,I2C_MSP3400C_DEM, 0x0005,
+		msp_write_dem(client, 0x0005,
 			       msp_init_data[type].fir2[i]);
 
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x0083,     /* MODE_REG */
+	msp_write_dem(client, 0x0083,     /* MODE_REG */
 		       msp_init_data[type].mode_reg);
 
 	msp3400c_setcarrier(client, msp_init_data[type].cdo1,
 			    msp_init_data[type].cdo2);
 
-	msp3400c_write(client,I2C_MSP3400C_DEM, 0x0056, 0); /*LOAD_REG_1/2*/
+	msp_write_dem(client, 0x0056, 0); /*LOAD_REG_1/2*/
 
 	if (dolby) {
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,
+		msp_write_dsp(client, 0x0008,
 			       0x0520); /* I2S1 */
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0009,
+		msp_write_dsp(client, 0x0009,
 			       0x0620); /* I2S2 */
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x000b,
+		msp_write_dsp(client, 0x000b,
 			       msp_init_data[type].dfp_src);
 	} else {
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,
+		msp_write_dsp(client, 0x0008,
 			       msp_init_data[type].dfp_src);
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0009,
+		msp_write_dsp(client, 0x0009,
 			       msp_init_data[type].dfp_src);
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x000b,
+		msp_write_dsp(client, 0x000b,
 			       msp_init_data[type].dfp_src);
 	}
-	msp3400c_write(client,I2C_MSP3400C_DFP, 0x000a,
+	msp_write_dsp(client, 0x000a,
 		       msp_init_data[type].dfp_src);
-	msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e,
+	msp_write_dsp(client, 0x000e,
 		       msp_init_data[type].dfp_matrix);
 
-	if (HAVE_NICAM(msp)) {
+	if (HAVE_NICAM(state)) {
 		/* nicam prescale */
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0010, 0x5a00); /* was: 0x3000 */
+		msp_write_dsp(client, 0x0010, 0x5a00); /* was: 0x3000 */
 	}
 }
 
 /* given a bitmask of VIDEO_SOUND_XXX returns the "best" in the bitmask */
-static int best_video_sound(int rxsubchans)
+static int msp3400c_best_video_sound(int rxsubchans)
 {
 	if (rxsubchans & V4L2_TUNER_SUB_STEREO)
 		return V4L2_TUNER_MODE_STEREO;
@@ -581,38 +595,37 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode)
 	static char *strmode[] = { "0", "mono", "stereo", "3",
 		"lang1", "5", "6", "7", "lang2"
 	};
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 	int nicam = 0;		/* channel source: FM/AM or nicam */
 	int src = 0;
 
-	if (IS_MSP34XX_G(msp)) {
+	if (state->opmode == OPMODE_AUTOSELECT) {
 		/* this method would break everything, let's make sure
 		 * it's never called
 		 */
-		msp3400_dbg
-		    ("DEBUG WARNING setstereo called with mode=%d instead of set_source (ignored)\n",
+		msp_dbg1("setstereo called with mode=%d instead of set_source (ignored)\n",
 		     mode);
 		return;
 	}
 
 	/* switch demodulator */
-	switch (msp->mode) {
+	switch (state->mode) {
 	case MSP_MODE_FM_TERRA:
-		msp3400_dbg("FM setstereo: %s\n", strmode[mode]);
-		msp3400c_setcarrier(client,msp->second,msp->main);
+		msp_dbg1("FM setstereo: %s\n", strmode[mode]);
+		msp3400c_setcarrier(client,state->second,state->main);
 		switch (mode) {
 		case V4L2_TUNER_MODE_STEREO:
-			msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3001);
+			msp_write_dsp(client, 0x000e, 0x3001);
 			break;
 		case V4L2_TUNER_MODE_MONO:
 		case V4L2_TUNER_MODE_LANG1:
 		case V4L2_TUNER_MODE_LANG2:
-			msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3000);
+			msp_write_dsp(client, 0x000e, 0x3000);
 			break;
 		}
 		break;
 	case MSP_MODE_FM_SAT:
-		msp3400_dbg("SAT setstereo: %s\n", strmode[mode]);
+		msp_dbg1("SAT setstereo: %s\n", strmode[mode]);
 		switch (mode) {
 		case V4L2_TUNER_MODE_MONO:
 			msp3400c_setcarrier(client, MSP_CARRIER(6.5), MSP_CARRIER(6.5));
@@ -631,38 +644,38 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode)
 	case MSP_MODE_FM_NICAM1:
 	case MSP_MODE_FM_NICAM2:
 	case MSP_MODE_AM_NICAM:
-		msp3400_dbg("NICAM setstereo: %s\n",strmode[mode]);
-		msp3400c_setcarrier(client,msp->second,msp->main);
-		if (msp->nicam_on)
+		msp_dbg1("NICAM setstereo: %s\n",strmode[mode]);
+		msp3400c_setcarrier(client,state->second,state->main);
+		if (state->nicam_on)
 			nicam=0x0100;
 		break;
 	case MSP_MODE_BTSC:
-		msp3400_dbg("BTSC setstereo: %s\n",strmode[mode]);
+		msp_dbg1("BTSC setstereo: %s\n",strmode[mode]);
 		nicam=0x0300;
 		break;
 	case MSP_MODE_EXTERN:
-		msp3400_dbg("extern setstereo: %s\n",strmode[mode]);
+		msp_dbg1("extern setstereo: %s\n",strmode[mode]);
 		nicam = 0x0200;
 		break;
 	case MSP_MODE_FM_RADIO:
-		msp3400_dbg("FM-Radio setstereo: %s\n",strmode[mode]);
+		msp_dbg1("FM-Radio setstereo: %s\n",strmode[mode]);
 		break;
 	default:
-		msp3400_dbg("mono setstereo\n");
+		msp_dbg1("mono setstereo\n");
 		return;
 	}
 
 	/* switch audio */
-	switch (best_video_sound(mode)) {
+	switch (msp3400c_best_video_sound(mode)) {
 	case V4L2_TUNER_MODE_STEREO:
 		src = 0x0020 | nicam;
 		break;
 	case V4L2_TUNER_MODE_MONO:
-		if (msp->mode == MSP_MODE_AM_NICAM) {
-			msp3400_dbg("switching to AM mono\n");
+		if (state->mode == MSP_MODE_AM_NICAM) {
+			msp_dbg1("switching to AM mono\n");
 			/* AM mono decoding is handled by tuner, not MSP chip */
 			/* SCART switching control register */
-			msp3400c_set_scart(client,SCART_MONO,0);
+			msp_set_scart(client,SCART_MONO,0);
 			src = 0x0200;
 			break;
 		}
@@ -673,67 +686,67 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode)
 		src = 0x0010 | nicam;
 		break;
 	}
-	msp3400_dbg("setstereo final source/matrix = 0x%x\n", src);
+	msp_dbg1("setstereo final source/matrix = 0x%x\n", src);
 
 	if (dolby) {
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,0x0520);
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0009,0x0620);
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x000a,src);
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x000b,src);
+		msp_write_dsp(client, 0x0008,0x0520);
+		msp_write_dsp(client, 0x0009,0x0620);
+		msp_write_dsp(client, 0x000a,src);
+		msp_write_dsp(client, 0x000b,src);
 	} else {
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,src);
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x0009,src);
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x000a,src);
-		msp3400c_write(client,I2C_MSP3400C_DFP, 0x000b,src);
+		msp_write_dsp(client, 0x0008,src);
+		msp_write_dsp(client, 0x0009,src);
+		msp_write_dsp(client, 0x000a,src);
+		msp_write_dsp(client, 0x000b,src);
 	}
 }
 
 static void
 msp3400c_print_mode(struct i2c_client *client)
 {
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 
-	if (msp->main == msp->second) {
-		msp3400_dbg("mono sound carrier: %d.%03d MHz\n",
-		       msp->main/910000,(msp->main/910)%1000);
+	if (state->main == state->second) {
+		msp_dbg1("mono sound carrier: %d.%03d MHz\n",
+		       state->main/910000,(state->main/910)%1000);
 	} else {
-		msp3400_dbg("main sound carrier: %d.%03d MHz\n",
-		       msp->main/910000,(msp->main/910)%1000);
+		msp_dbg1("main sound carrier: %d.%03d MHz\n",
+		       state->main/910000,(state->main/910)%1000);
 	}
-	if (msp->mode == MSP_MODE_FM_NICAM1 || msp->mode == MSP_MODE_FM_NICAM2)
-		msp3400_dbg("NICAM/FM carrier   : %d.%03d MHz\n",
-		       msp->second/910000,(msp->second/910)%1000);
-	if (msp->mode == MSP_MODE_AM_NICAM)
-		msp3400_dbg("NICAM/AM carrier   : %d.%03d MHz\n",
-		       msp->second/910000,(msp->second/910)%1000);
-	if (msp->mode == MSP_MODE_FM_TERRA &&
-	    msp->main != msp->second) {
-		msp3400_dbg("FM-stereo carrier : %d.%03d MHz\n",
-		       msp->second/910000,(msp->second/910)%1000);
+	if (state->mode == MSP_MODE_FM_NICAM1 || state->mode == MSP_MODE_FM_NICAM2)
+		msp_dbg1("NICAM/FM carrier   : %d.%03d MHz\n",
+		       state->second/910000,(state->second/910)%1000);
+	if (state->mode == MSP_MODE_AM_NICAM)
+		msp_dbg1("NICAM/AM carrier   : %d.%03d MHz\n",
+		       state->second/910000,(state->second/910)%1000);
+	if (state->mode == MSP_MODE_FM_TERRA &&
+	    state->main != state->second) {
+		msp_dbg1("FM-stereo carrier : %d.%03d MHz\n",
+		       state->second/910000,(state->second/910)%1000);
 	}
 }
 
 static void msp3400c_restore_dfp(struct i2c_client *client)
 {
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 	int i;
 
 	for (i = 0; i < DFP_COUNT; i++) {
-		if (-1 == msp->dfp_regs[i])
+		if (-1 == state->dfp_regs[i])
 			continue;
-		msp3400c_write(client, I2C_MSP3400C_DFP, i, msp->dfp_regs[i]);
+		msp_write_dsp(client, i, state->dfp_regs[i]);
 	}
 }
 
 /* if the dfp_regs is set, set what's in there. Otherwise, set the default value */
-static int msp3400c_write_dfp_with_default(struct i2c_client *client,
+static int msp_write_dfp_with_default(struct i2c_client *client,
 					int addr, int default_value)
 {
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 	int value = default_value;
-	if (addr < DFP_COUNT && -1 != msp->dfp_regs[addr])
-		value = msp->dfp_regs[addr];
-	return msp3400c_write(client, I2C_MSP3400C_DFP, addr, value);
+	if (addr < DFP_COUNT && -1 != state->dfp_regs[addr])
+		value = state->dfp_regs[addr];
+	return msp_write_dsp(client, addr, value);
 }
 
 /* ----------------------------------------------------------------------- */
@@ -753,18 +766,18 @@ struct REGISTER_DUMP d1[] = {
 
 static int autodetect_stereo(struct i2c_client *client)
 {
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 	int val;
-	int rxsubchans = msp->rxsubchans;
-	int newnicam   = msp->nicam_on;
+	int rxsubchans = state->rxsubchans;
+	int newnicam   = state->nicam_on;
 	int update = 0;
 
-	switch (msp->mode) {
+	switch (state->mode) {
 	case MSP_MODE_FM_TERRA:
-		val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x18);
+		val = msp_read_dsp(client, 0x18);
 		if (val > 32767)
 			val -= 65536;
-		msp3400_dbg("stereo detect register: %d\n",val);
+		msp_dbg2("stereo detect register: %d\n",val);
 		if (val > 4096) {
 			rxsubchans = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
 		} else if (val < -4096) {
@@ -777,8 +790,8 @@ static int autodetect_stereo(struct i2c_client *client)
 	case MSP_MODE_FM_NICAM1:
 	case MSP_MODE_FM_NICAM2:
 	case MSP_MODE_AM_NICAM:
-		val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x23);
-		msp3400_dbg("nicam sync=%d, mode=%d\n",
+		val = msp_read_dem(client, 0x23);
+		msp_dbg2("nicam sync=%d, mode=%d\n",
 			val & 1, (val & 0x1e) >> 1);
 
 		if (val & 1) {
@@ -810,8 +823,8 @@ static int autodetect_stereo(struct i2c_client *client)
 		}
 		break;
 	case MSP_MODE_BTSC:
-		val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x200);
-		msp3400_dbg("status=0x%x (pri=%s, sec=%s, %s%s%s)\n",
+		val = msp_read_dem(client, 0x200);
+		msp_dbg2("status=0x%x (pri=%s, sec=%s, %s%s%s)\n",
 			val,
 			(val & 0x0002) ? "no"     : "yes",
 			(val & 0x0004) ? "no"     : "yes",
@@ -823,17 +836,17 @@ static int autodetect_stereo(struct i2c_client *client)
 		if (val & 0x0100) rxsubchans |= V4L2_TUNER_SUB_LANG1;
 		break;
 	}
-	if (rxsubchans != msp->rxsubchans) {
+	if (rxsubchans != state->rxsubchans) {
 		update = 1;
-		msp3400_dbg("watch: rxsubchans %d => %d\n",
-			msp->rxsubchans,rxsubchans);
-		msp->rxsubchans = rxsubchans;
+		msp_dbg1("watch: rxsubchans %d => %d\n",
+			state->rxsubchans,rxsubchans);
+		state->rxsubchans = rxsubchans;
 	}
-	if (newnicam != msp->nicam_on) {
+	if (newnicam != state->nicam_on) {
 		update = 1;
-		msp3400_dbg("watch: nicam %d => %d\n",
-			msp->nicam_on,newnicam);
-		msp->nicam_on = newnicam;
+		msp_dbg1("watch: nicam %d => %d\n",
+			state->nicam_on,newnicam);
+		state->nicam_on = newnicam;
 	}
 	return update;
 }
@@ -843,11 +856,11 @@ static int autodetect_stereo(struct i2c_client *client)
  * in the ioctl while doing the sound carrier & stereo detect
  */
 
-static int msp34xx_sleep(struct msp3400c *msp, int timeout)
+static int msp_sleep(struct msp_state *state, int timeout)
 {
 	DECLARE_WAITQUEUE(wait, current);
 
-	add_wait_queue(&msp->wq, &wait);
+	add_wait_queue(&state->wq, &wait);
 	if (!kthread_should_stop()) {
 		if (timeout < 0) {
 			set_current_state(TASK_INTERRUPTIBLE);
@@ -858,90 +871,90 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
 		}
 	}
 
-	remove_wait_queue(&msp->wq, &wait);
+	remove_wait_queue(&state->wq, &wait);
 	try_to_freeze();
-	return msp->restart;
+	return state->restart;
 }
 
 /* stereo/multilang monitoring */
 static void watch_stereo(struct i2c_client *client)
 {
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 
 	if (autodetect_stereo(client)) {
-		if (msp->stereo & V4L2_TUNER_MODE_STEREO)
+		if (state->stereo & V4L2_TUNER_MODE_STEREO)
 			msp3400c_setstereo(client, V4L2_TUNER_MODE_STEREO);
-		else if (msp->stereo & VIDEO_SOUND_LANG1)
+		else if (state->stereo & VIDEO_SOUND_LANG1)
 			msp3400c_setstereo(client, V4L2_TUNER_MODE_LANG1);
 		else
 			msp3400c_setstereo(client, V4L2_TUNER_MODE_MONO);
 	}
 
 	if (once)
-		msp->watch_stereo = 0;
+		state->watch_stereo = 0;
 }
 
 
 static int msp3400c_thread(void *data)
 {
 	struct i2c_client *client = data;
-	struct msp3400c *msp = i2c_get_clientdata(client);
+	struct msp_state *state = i2c_get_clientdata(client);
 	struct CARRIER_DETECT *cd;
 	int count, max1,max2,val1,val2, val,this;
 
 
-	msp3400_info("msp3400 daemon started\n");
+	msp_info("msp3400 daemon started\n");
 	for (;;) {
-		msp3400_dbg_mediumvol("msp3400 thread: sleep\n");
-		msp34xx_sleep(msp,-1);
-		msp3400_dbg_mediumvol("msp3400 thread: wakeup\n");
+		msp_dbg2("msp3400 thread: sleep\n");
+		msp_sleep(state, -1);
+		msp_dbg2("msp3400 thread: wakeup\n");
 
 	restart:
-		msp3400_dbg("thread: restart scan\n");
-		msp->restart = 0;
+		msp_dbg1("thread: restart scan\n");
+		state->restart = 0;
 		if (kthread_should_stop())
 			break;
 
-		if (VIDEO_MODE_RADIO == msp->norm ||
-		    MSP_MODE_EXTERN  == msp->mode) {
+		if (VIDEO_MODE_RADIO == state->norm ||
+		    MSP_MODE_EXTERN  == state->mode) {
 			/* no carrier scan, just unmute */
-			msp3400_info("thread: no carrier scan\n");
-			msp3400c_setvolume(client, msp->muted, msp->left, msp->right);
+			msp_info("thread: no carrier scan\n");
+			msp_set_volume(client, state->muted, state->left, state->right);
 			continue;
 		}
 
 		/* mute */
-		msp3400c_setvolume(client, msp->muted, 0, 0);
+		msp_set_volume(client, state->muted, 0, 0);
 		msp3400c_setmode(client, MSP_MODE_AM_DETECT /* +1 */ );
 		val1 = val2 = 0;
 		max1 = max2 = -1;
-		msp->watch_stereo = 0;
+		state->watch_stereo = 0;
 
 		/* some time for the tuner to sync */
-		if (msp34xx_sleep(msp,200))
+		if (msp_sleep(state,200))
 			goto restart;
 
 		/* carrier detect pass #1 -- main carrier */
 		cd = carrier_detect_main;
 		count = CARRIER_COUNT(carrier_detect_main);
 
-		if (amsound && (msp->norm == VIDEO_MODE_SECAM)) {
+		if (amsound && (state->norm == VIDEO_MODE_SECAM)) {
 			/* autodetect doesn't work well with AM ... */
 			max1 = 3;
 			count = 0;
-			msp3400_dbg("AM sound override\n");
+			msp_dbg1("AM sound override\n");
 		}
 
 		for (this = 0; this < count; this++) {
 			msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo);
-			if (msp34xx_sleep(msp,100))
+			if (msp_sleep(state,100))
 				goto restart;
-			val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b);
+			val = msp_read_dsp(client, 0x1b);
 			if (val > 32767)
 				val -= 65536;
 			if (val1 < val)
 				val1 = val, max1 = this;
-			msp3400_dbg("carrier1 val: %5d / %s\n", val,cd[this].name);
+			msp_dbg1("carrier1 val: %5d / %s\n", val,cd[this].name);
 		}
 
 		/* carrier detect pass #2 -- second (stereo) carrier */
@@ -962,7 +975,7 @@ static int msp3400c_thread(void *data)
 			break;
 		}
 
-		if (amsound && (msp->norm == VIDEO_MODE_SECAM)) {
+		if (amsound && (state->norm == VIDEO_MODE_SECAM)) {
 			/* autodetect doesn't work well with AM ... */
 			cd = NULL;
 			count = 0;
@@ -970,72 +983,72 @@ static int msp3400c_thread(void *data)
 		}
 		for (this = 0; this < count; this++) {
 			msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo);
-			if (msp34xx_sleep(msp,100))
+			if (msp_sleep(state,100))
 				goto restart;
-			val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b);
+			val = msp_read_dsp(client, 0x1b);
 			if (val > 32767)
 				val -= 65536;
 			if (val2 < val)
 				val2 = val, max2 = this;
-			msp3400_dbg("carrier2 val: %5d / %s\n", val,cd[this].name);
+			msp_dbg1("carrier2 val: %5d / %s\n", val,cd[this].name);
 		}
 
-		/* programm the msp3400 according to the results */
-		msp->main   = carrier_detect_main[max1].cdo;
+		/* program the msp3400 according to the results */
+		state->main   = carrier_detect_main[max1].cdo;
 		switch (max1) {
 		case 1: /* 5.5 */
 			if (max2 == 0) {
 				/* B/G FM-stereo */
-				msp->second = carrier_detect_55[max2].cdo;
+				state->second = carrier_detect_55[max2].cdo;
 				msp3400c_setmode(client, MSP_MODE_FM_TERRA);
-				msp->nicam_on = 0;
+				state->nicam_on = 0;
 				msp3400c_setstereo(client, V4L2_TUNER_MODE_MONO);
-				msp->watch_stereo = 1;
-			} else if (max2 == 1 && HAVE_NICAM(msp)) {
+				state->watch_stereo = 1;
+			} else if (max2 == 1 && HAVE_NICAM(state)) {
 				/* B/G NICAM */
-				msp->second = carrier_detect_55[max2].cdo;
+				state->second = carrier_detect_55[max2].cdo;
 				msp3400c_setmode(client, MSP_MODE_FM_NICAM1);
-				msp->nicam_on = 1;
-				msp3400c_setcarrier(client, msp->second, msp->main);
-				msp->watch_stereo = 1;
+				state->nicam_on = 1;
+				msp3400c_setcarrier(client, state->second, state->main);
+				state->watch_stereo = 1;
 			} else {
 				goto no_second;
 			}
 			break;
 		case 2: /* 6.0 */
 			/* PAL I NICAM */
-			msp->second = MSP_CARRIER(6.552);
+			state->second = MSP_CARRIER(6.552);
 			msp3400c_setmode(client, MSP_MODE_FM_NICAM2);
-			msp->nicam_on = 1;
-			msp3400c_setcarrier(client, msp->second, msp->main);
-			msp->watch_stereo = 1;
+			state->nicam_on = 1;
+			msp3400c_setcarrier(client, state->second, state->main);
+			state->watch_stereo = 1;
 			break;
 		case 3: /* 6.5 */
 			if (max2 ==