[PATCH] v4l: 885: second round of i2c ids redefinition cleanup

[mv-sheeva.git] / drivers / media / video / msp3400.c

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 699cea2cc6487e48e6e613e828036f8b5faf419c..d603229c9f2f9ccd4689872bba477572e4d92e4a 100644 (file)
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -54,7 +54,6 @@
 #include <asm/pgtable.h>
 
 #include <media/audiochip.h>
-#include <media/id.h>
 #include "msp3400.h"
 
 #define OPMODE_AUTO    -1
@@ -1788,10 +1787,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
                dprintk("msp34xx: AUDC_SET_RADIO\n");
                msp->norm = VIDEO_MODE_RADIO;
                dprintk("msp34xx: switching to radio mode\n");
-               if (IS_MSP34XX_G(msp)) {
+               if (IS_MSP34XX_G(msp))
                        msp34xxg_reset(client);
-                       break;
-               }
+
                msp->watch_stereo = 0;
                switch (msp->opmode) {
                case OPMODE_MANUAL:
@@ -1906,10 +1904,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
                dprintk("msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm);
                msp->norm = vc->norm;
-               if (IS_MSP34XX_G(msp)) {
+               if (IS_MSP34XX_G(msp))
                        msp34xxg_reset(client);
-                       break;
-               }
+
                msp_wake_thread(client);
                break;
        }
@@ -1919,10 +1916,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
        {
                /* new channel -- kick audio carrier scan */
                dprintk("msp34xx: VIDIOCSFREQ\n");
-               if (IS_MSP34XX_G(msp)) {
+               if (IS_MSP34XX_G(msp))
                        msp34xxg_reset(client);
-                       break;
-               }
+
                msp_wake_thread(client);
                break;
        }