diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2007-10-16 04:27:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:09 -0400 |
commit | 86eeb6fe71c79bd0484e17d267034249a6943bd5 (patch) | |
tree | a7ebdb60338be5920a4ef30d905e7b5803ff7c8e /drivers | |
parent | 8b7f9b81c8546ce4a9a42cb9c1c5a290a1ce1949 (diff) |
OMAP2 McSPI code cleanup
Remove unused variable & write space
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/spi/omap2_mcspi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 6b357cdb9ea3..3cdab131c4a9 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
@@ -645,7 +645,7 @@ static int omap2_mcspi_setup(struct spi_device *spi) | |||
645 | 645 | ||
646 | clk_enable(mcspi->ick); | 646 | clk_enable(mcspi->ick); |
647 | clk_enable(mcspi->fck); | 647 | clk_enable(mcspi->fck); |
648 | ret = omap2_mcspi_setup_transfer(spi, NULL); | 648 | ret = omap2_mcspi_setup_transfer(spi, NULL); |
649 | clk_disable(mcspi->fck); | 649 | clk_disable(mcspi->fck); |
650 | clk_disable(mcspi->ick); | 650 | clk_disable(mcspi->ick); |
651 | 651 | ||
@@ -693,7 +693,6 @@ static void omap2_mcspi_work(struct work_struct *work) | |||
693 | struct spi_device *spi; | 693 | struct spi_device *spi; |
694 | struct spi_transfer *t = NULL; | 694 | struct spi_transfer *t = NULL; |
695 | int cs_active = 0; | 695 | int cs_active = 0; |
696 | struct omap2_mcspi_device_config *conf; | ||
697 | struct omap2_mcspi_cs *cs; | 696 | struct omap2_mcspi_cs *cs; |
698 | int par_override = 0; | 697 | int par_override = 0; |
699 | int status = 0; | 698 | int status = 0; |
@@ -706,7 +705,6 @@ static void omap2_mcspi_work(struct work_struct *work) | |||
706 | spin_unlock_irq(&mcspi->lock); | 705 | spin_unlock_irq(&mcspi->lock); |
707 | 706 | ||
708 | spi = m->spi; | 707 | spi = m->spi; |
709 | conf = spi->controller_data; | ||
710 | cs = spi->controller_state; | 708 | cs = spi->controller_state; |
711 | 709 | ||
712 | omap2_mcspi_set_enable(spi, 1); | 710 | omap2_mcspi_set_enable(spi, 1); |