diff options
| author | Mike Rapoport <mike.rapoport@gmail.com> | 2015-10-22 09:38:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-24 19:02:42 -0700 |
| commit | cfac7d6a70b41982c770838edd5c2a3b4dbe55e6 (patch) | |
| tree | afc92bb89af99d3d7b205feca83508a31883dcb1 /drivers/staging/sm750fb/ddk750_chip.c | |
| parent | f741554e25e5c94bca1d5157608baab80586f81c (diff) | |
| download | talos-obmc-linux-cfac7d6a70b41982c770838edd5c2a3b4dbe55e6.tar.gz talos-obmc-linux-cfac7d6a70b41982c770838edd5c2a3b4dbe55e6.zip | |
staging: sm750fb: remove '#if 1' conditionals
The code enclosed in '#if 1' anyway gets compiled. Removing useless
conditionals.
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/sm750fb/ddk750_chip.c')
| -rw-r--r-- | drivers/staging/sm750fb/ddk750_chip.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c index bab3d91c70bf..069d6e57d7a7 100644 --- a/drivers/staging/sm750fb/ddk750_chip.c +++ b/drivers/staging/sm750fb/ddk750_chip.c @@ -60,11 +60,10 @@ static void setChipClock(unsigned int frequency) { pll_value_t pll; unsigned int ulActualMxClk; -#if 1 + /* Cheok_0509: For SM750LE, the chip clock is fixed. Nothing to set. */ if (getChipType() == SM750LE) return; -#endif if (frequency) { /* @@ -88,11 +87,11 @@ static void setChipClock(unsigned int frequency) static void setMemoryClock(unsigned int frequency) { unsigned int ulReg, divisor; - #if 1 + /* Cheok_0509: For SM750LE, the memory clock is fixed. Nothing to set. */ if (getChipType() == SM750LE) return; -#endif + if (frequency) { /* Set the frequency to the maximum frequency that the DDR Memory can take which is 336MHz. */ @@ -135,11 +134,11 @@ static void setMemoryClock(unsigned int frequency) static void setMasterClock(unsigned int frequency) { unsigned int ulReg, divisor; -#if 1 + /* Cheok_0509: For SM750LE, the memory clock is fixed. Nothing to set. */ if (getChipType() == SM750LE) return; -#endif + if (frequency) { /* Set the frequency to the maximum frequency that the SM750 engine can run, which is about 190 MHz. */ @@ -332,13 +331,11 @@ unsigned int calcPllValue(unsigned int request_orig, pll_value_t *pll) unsigned int tmpClock, ret; pllcalparam *xparm; -#if 1 if (getChipType() == SM750LE) { /* SM750LE don't have prgrammable PLL and M/N values to work on. Just return the requested clock. */ return request_orig; } -#endif ret = 0; mini_diff = ~0; |
