1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c
index 005f1109364..34b96c7cfd6 100644
--- a/drivers/media/video/cx25840/cx25840-audio.c
+++ b/drivers/media/video/cx25840/cx25840-audio.c
@@ -480,7 +480,6 @@ void cx25840_audio_set_path(struct i2c_client *client)
 
 static void set_volume(struct i2c_client *client, int volume)
 {
-        struct cx25840_state *state = to_state(i2c_get_clientdata(client));
         int vol;
 
         /* Convert the volume to msp3400 values (0-127) */
@@ -496,14 +495,7 @@ static void set_volume(struct i2c_client *client, int volume)
         }
 
         /* PATH1_VOLUME */
-        if (is_cx2388x(state)) {
-                /* for cx23885 volume doesn't work,
-                 * the calculation always results in
-                 * e4 regardless.
-                 */
-                cx25840_write(client, 0x8d4, volume);
-        } else
-                cx25840_write(client, 0x8d4, 228 - (vol * 2));
+        cx25840_write(client, 0x8d4, 228 - (vol * 2));
 }
 
 static void set_balance(struct i2c_client *client, int balance)