Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[linux.git] / drivers / gpu / drm / sti / sti_awg_utils.c

diff --git a/drivers/gpu/drm/sti/sti_awg_utils.c b/drivers/gpu/drm/sti/sti_awg_utils.c
index 6029a2e3db1dc8feb5243e992abef98594d2a766..00d0698be9d33e7b4517c9e39c186607676a8399 100644 (file)
--- a/drivers/gpu/drm/sti/sti_awg_utils.c
+++ b/drivers/gpu/drm/sti/sti_awg_utils.c
@@ -65,7 +65,6 @@ static int awg_generate_instr(enum opcode opcode,
 
                        mux = 0;
                        data_enable = 0;
-                       arg = (arg << 22) >> 22;
                        arg &= (0x3ff);
                        break;
                case REPEAT:
@@ -77,14 +76,12 @@ static int awg_generate_instr(enum opcode opcode,
 
                        mux = 0;
                        data_enable = 0;
-                       arg = (arg << 22) >> 22;
                        arg &= (0x3ff);
                        break;
                case JUMP:
                        mux = 0;
                        data_enable = 0;
                        arg |= 0x40; /* for jump instruction 7th bit is 1 */
-                       arg = (arg << 22) >> 22;
                        arg &= 0x3ff;
                        break;
                case STOP:
@@ -94,7 +91,6 @@ static int awg_generate_instr(enum opcode opcode,
                case RPTSET:
                case RPLSET:
                case HOLD:
-                       arg = (arg << 24) >> 24;
                        arg &= (0x0ff);
                        break;
                default: