diff for duplicates of <20161109092749.1454700-1-arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index 01e936c..3731862 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -96,7 +96,7 @@ index 14b5112dfb03..94f59f446322 100644 @@ -261,7 +261,7 @@ int ddk750_init_hw(struct initchip_param *pInitParam) } - if (pInitParam->setAllEngOff = 1) { + if (pInitParam->setAllEngOff == 1) { - enable_2d_engine(0); + sm750_enable_2d_engine(0); @@ -172,7 +172,7 @@ index 47d224e542c3..4a4b1de97a87 100644 +++ b/drivers/staging/sm750fb/ddk750_mode.c @@ -83,7 +83,7 @@ static int programModeRegisters(mode_parameter_t *pModeParam, - if (pll->clockType = SECONDARY_PLL) { + if (pll->clockType == SECONDARY_PLL) { /* programe secondary pixel clock */ - POKE32(CRT_PLL_CTRL, format_pll_reg(pll)); + POKE32(CRT_PLL_CTRL, sm750_format_pll_reg(pll)); @@ -180,7 +180,7 @@ index 47d224e542c3..4a4b1de97a87 100644 (((pModeParam->horizontal_total - 1) << CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) & @@ -133,7 +133,7 @@ static int programModeRegisters(mode_parameter_t *pModeParam, - } else if (pll->clockType = PRIMARY_PLL) { + } else if (pll->clockType == PRIMARY_PLL) { unsigned int reserved; - POKE32(PANEL_PLL_CTRL, format_pll_reg(pll)); @@ -194,7 +194,7 @@ index 47d224e542c3..4a4b1de97a87 100644 - uiActualPixelClk = calc_pll_value(parm->pixel_clock, &pll); + uiActualPixelClk = sm750_calc_pll_value(parm->pixel_clock, &pll); - if (sm750_get_chip_type() = SM750LE) { + if (sm750_get_chip_type() == SM750LE) { /* set graphic mode via IO method */ outb_p(0x88, 0x3d4); diff --git a/drivers/staging/sm750fb/ddk750_power.c b/drivers/staging/sm750fb/ddk750_power.c @@ -217,7 +217,7 @@ index 6f4374057405..6167e30e8e01 100644 -void set_current_gate(unsigned int gate) +void sm750_set_current_gate(unsigned int gate) { - if (get_power_mode() = POWER_MODE_CTRL_MODE_MODE1) + if (get_power_mode() == POWER_MODE_CTRL_MODE_MODE1) POKE32(MODE1_GATE, gate); @@ -85,7 +85,7 @@ void set_current_gate(unsigned int gate) /* @@ -594,7 +594,7 @@ index 23b6b1cda529..b6af3b53076b 100644 - enable_2d_engine(1); + sm750_enable_2d_engine(1); - if (sm750_get_chip_type() = SM750LE) { + if (sm750_get_chip_type() == SM750LE) { reg = PEEK32(DE_STATE1); -- 2.9.0 diff --git a/a/content_digest b/N1/content_digest index b36fb92..5be0af9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Arnd Bergmann <arnd@arndb.de>\0" "Subject\0[PATCH] staging: sm750fb: prefix global identifiers\0" - "Date\0Wed, 09 Nov 2016 09:26:27 +0000\0" + "Date\0Wed, 9 Nov 2016 10:26:27 +0100\0" "To\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Cc\0Arnd Bergmann <arnd@arndb.de>" Sudip Mukherjee <sudipm.mukherjee@gmail.com> @@ -110,7 +110,7 @@ "@@ -261,7 +261,7 @@ int ddk750_init_hw(struct initchip_param *pInitParam)\n" " \t}\n" " \n" - " \tif (pInitParam->setAllEngOff = 1) {\n" + " \tif (pInitParam->setAllEngOff == 1) {\n" "-\t\tenable_2d_engine(0);\n" "+\t\tsm750_enable_2d_engine(0);\n" " \n" @@ -186,7 +186,7 @@ "+++ b/drivers/staging/sm750fb/ddk750_mode.c\n" "@@ -83,7 +83,7 @@ static int programModeRegisters(mode_parameter_t *pModeParam,\n" " \n" - " \tif (pll->clockType = SECONDARY_PLL) {\n" + " \tif (pll->clockType == SECONDARY_PLL) {\n" " \t\t/* programe secondary pixel clock */\n" "-\t\tPOKE32(CRT_PLL_CTRL, format_pll_reg(pll));\n" "+\t\tPOKE32(CRT_PLL_CTRL, sm750_format_pll_reg(pll));\n" @@ -194,7 +194,7 @@ " \t\t\t(((pModeParam->horizontal_total - 1) <<\n" " \t\t\t\tCRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &\n" "@@ -133,7 +133,7 @@ static int programModeRegisters(mode_parameter_t *pModeParam,\n" - " \t} else if (pll->clockType = PRIMARY_PLL) {\n" + " \t} else if (pll->clockType == PRIMARY_PLL) {\n" " \t\tunsigned int reserved;\n" " \n" "-\t\tPOKE32(PANEL_PLL_CTRL, format_pll_reg(pll));\n" @@ -208,7 +208,7 @@ " \n" "-\tuiActualPixelClk = calc_pll_value(parm->pixel_clock, &pll);\n" "+\tuiActualPixelClk = sm750_calc_pll_value(parm->pixel_clock, &pll);\n" - " \tif (sm750_get_chip_type() = SM750LE) {\n" + " \tif (sm750_get_chip_type() == SM750LE) {\n" " \t\t/* set graphic mode via IO method */\n" " \t\toutb_p(0x88, 0x3d4);\n" "diff --git a/drivers/staging/sm750fb/ddk750_power.c b/drivers/staging/sm750fb/ddk750_power.c\n" @@ -231,7 +231,7 @@ "-void set_current_gate(unsigned int gate)\n" "+void sm750_set_current_gate(unsigned int gate)\n" " {\n" - " \tif (get_power_mode() = POWER_MODE_CTRL_MODE_MODE1)\n" + " \tif (get_power_mode() == POWER_MODE_CTRL_MODE_MODE1)\n" " \t\tPOKE32(MODE1_GATE, gate);\n" "@@ -85,7 +85,7 @@ void set_current_gate(unsigned int gate)\n" " /*\n" @@ -608,9 +608,9 @@ "-\tenable_2d_engine(1);\n" "+\tsm750_enable_2d_engine(1);\n" " \n" - " \tif (sm750_get_chip_type() = SM750LE) {\n" + " \tif (sm750_get_chip_type() == SM750LE) {\n" " \t\treg = PEEK32(DE_STATE1);\n" "-- \n" 2.9.0 -88bd6cbba419f0492e41d64b0fc3a78e6f155b71fbef81cd953a7bc2008c9caa +a055a90664523bee14f948f7f527384cc00aa23c45f53fe672dee2bd4bbb192e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.