commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=602c657b0c80c12f90897be7d05bd330cdbf666b branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]> --- drivers/spi/Makefile | 2 +- drivers/spi/{spi_bfin6xx.c => spi-bfin6xx.c} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 8378a7b..2d48535 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o obj-$(CONFIG_SPI_ATH79) += spi-ath79.o obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o -obj-$(CONFIG_SPI_BFIN6XX) += spi_bfin6xx.o +obj-$(CONFIG_SPI_BFIN6XX) += spi-bfin6xx.o obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o diff --git a/drivers/spi/spi_bfin6xx.c b/drivers/spi/spi-bfin6xx.c similarity index 99% rename from drivers/spi/spi_bfin6xx.c rename to drivers/spi/spi-bfin6xx.c index 850a753..8375db0 100644 --- a/drivers/spi/spi_bfin6xx.c +++ b/drivers/spi/spi-bfin6xx.c @@ -149,7 +149,7 @@ static void bfin_spi_cs_active(struct bfin_spi_master_data *drv_data, struct bfi } static void bfin_spi_cs_deactive(struct bfin_spi_master_data *drv_data, - struct bfin_spi_slave_data *chip) + struct bfin_spi_slave_data *chip) { if (likely(chip->chip_select_num < MAX_CTRL_CS)) bfin_write_or(&drv_data->regs->ssel, chip->ssel); @@ -163,14 +163,14 @@ static void bfin_spi_cs_deactive(struct bfin_spi_master_data *drv_data, /* enable or disable the pin muxed by GPIO and SPI CS to work as SPI CS */ static inline void bfin_spi_cs_enable(struct bfin_spi_master_data *drv_data, - struct bfin_spi_slave_data *chip) + struct bfin_spi_slave_data *chip) { if (chip->chip_select_num < MAX_CTRL_CS) bfin_write_or(&drv_data->regs->ssel, chip->ssel >> 8); } static inline void bfin_spi_cs_disable(struct bfin_spi_master_data *drv_data, - struct bfin_spi_slave_data *chip) + struct bfin_spi_slave_data *chip) { if (chip->chip_select_num < MAX_CTRL_CS) bfin_write_and(&drv_data->regs->ssel, ~(chip->ssel >> 8)); @@ -726,7 +726,7 @@ static int bfin_spi_setup(struct spi_device *spi) if (chip->chip_select_num < MAX_CTRL_CS) { ret = peripheral_request(ssel[spi->master->bus_num] - [chip->chip_select_num-1], spi->modalias); + [chip->chip_select_num-1], spi->modalias); if (ret) { dev_err(&spi->dev, "peripheral_request() error\n"); goto pin_error; @@ -740,7 +740,7 @@ static int bfin_spi_setup(struct spi_device *spi) dev_dbg(&spi->dev, "chip select number is %d\n", chip->chip_select_num); spi_set_ctldata(spi, chip); - + bfin_spi_cs_enable(drv_data, chip); bfin_spi_cs_deactive(drv_data, chip); @@ -987,7 +987,7 @@ static int __devexit bfin_spi_remove(struct platform_device *pdev) /* Disconnect from the SPI framework */ spi_unregister_master(drv_data->master); - + /* Prevent double remove */ platform_set_drvdata(pdev, NULL);
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
