From: Andrew Morton Cc: Ben Dooks Cc: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/spi/spi_s3c24xx.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff -puN drivers/spi/spi_s3c24xx.c~s3c24xx-hardware-spi-driver-tidy drivers/spi/spi_s3c24xx.c --- devel/drivers/spi/spi_s3c24xx.c~s3c24xx-hardware-spi-driver-tidy 2006-05-11 01:33:41.000000000 -0700 +++ devel-akpm/drivers/spi/spi_s3c24xx.c 2006-05-11 01:33:41.000000000 -0700 @@ -73,11 +73,10 @@ static void s3c24xx_spi_chipsel(struct s switch (value) { case BITBANG_CS_INACTIVE: - if (hw->pdata->set_cs) { + if (hw->pdata->set_cs) hw->pdata->set_cs(hw->pdata, value, cspol); - } else { + else s3c2410_gpio_setpin(hw->pdata->pin_cs, cspol ^ 1); - } break; case BITBANG_CS_ACTIVE: @@ -99,11 +98,10 @@ static void s3c24xx_spi_chipsel(struct s writeb(spcon, hw->regs + S3C2410_SPCON); - if (hw->pdata->set_cs) { + if (hw->pdata->set_cs) hw->pdata->set_cs(hw->pdata, value, cspol); - } else { + else s3c2410_gpio_setpin(hw->pdata->pin_cs, cspol); - } break; @@ -403,7 +401,6 @@ static int s3c24xx_spi_remove(struct pla } - #ifdef CONFIG_PM static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg) @@ -429,13 +426,13 @@ static int s3c24xx_spi_resume(struct pla static struct platform_driver s3c24xx_spidrv = { .probe = s3c24xx_spi_probe, - .remove = s3c24xx_spi_remove, - .suspend = s3c24xx_spi_suspend, - .resume = s3c24xx_spi_resume, - .driver = { + .remove = s3c24xx_spi_remove, + .suspend = s3c24xx_spi_suspend, + .resume = s3c24xx_spi_resume, + .driver = { .name = "s3c2410-spi", .owner = THIS_MODULE, - }, + }, }; static int __init s3c24xx_spi_init(void) _