KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: 3.2: get rid of an unused variable in ath79_spi.c

Browse source 
SVN-Revision: 30391
This commit is contained in:
Gabor Juhos 2012-02-08 20:47:58 +00:00
parent c126bed503
commit 09c45f50d4
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
target/linux/ar71xx/patches-3.2/205-spi-ath79-introduce-ath79_spi_-en-dis-able-helpers.patch
View file

@ -27,7 +27,7 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
/* enable GPIO mode */ /* enable GPIO mode */
ath79_spi_wr(sp, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO); ath79_spi_wr(sp, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
@@ -108,6 +100,25 @@ static int ath79_spi_setup_cs(struct spi @@ -108,6 +100,24 @@ static int ath79_spi_setup_cs(struct spi
/* TODO: setup speed? */ /* TODO: setup speed? */
ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43); ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
@ -43,7 +43,6 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
+ +
+static int ath79_spi_setup_cs(struct spi_device *spi) +static int ath79_spi_setup_cs(struct spi_device *spi)
+{ +{
+ struct ath79_spi *sp = ath79_spidev_to_sp(spi);
+ struct ath79_spi_controller_data *cdata; + struct ath79_spi_controller_data *cdata;
+ int status; + int status;
+ +
@ -53,7 +52,13 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
status = 0; status = 0;
if (spi->chip_select) { if (spi->chip_select) {
@@ -134,11 +145,6 @@ static void ath79_spi_cleanup_cs(struct @@ -128,17 +138,10 @@ static int ath79_spi_setup_cs(struct spi
static void ath79_spi_cleanup_cs(struct spi_device *spi)
{
- struct ath79_spi *sp = ath79_spidev_to_sp(spi);
-
if (spi->chip_select) {
struct ath79_spi_controller_data *cdata = spi->controller_data; struct ath79_spi_controller_data *cdata = spi->controller_data;
gpio_free(cdata->gpio); gpio_free(cdata->gpio);
} }
@ -65,7 +70,7 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
} }
static int ath79_spi_setup(struct spi_device *spi) static int ath79_spi_setup(struct spi_device *spi)
@@ -242,13 +248,15 @@ static __devinit int ath79_spi_probe(str @@ -242,13 +245,15 @@ static __devinit int ath79_spi_probe(str
goto err_put_master; goto err_put_master;
} }
@ -83,7 +88,7 @@ Subject: [PATCH 5/7] spi/ath79: introduce ath79_spi_{en,dis}able helpers
iounmap(sp->base); iounmap(sp->base);
err_put_master: err_put_master:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
@@ -262,6 +270,7 @@ static __devexit int ath79_spi_remove(st @@ -262,6 +267,7 @@ static __devexit int ath79_spi_remove(st
struct ath79_spi *sp = platform_get_drvdata(pdev); struct ath79_spi *sp = platform_get_drvdata(pdev);
spi_bitbang_stop(&sp->bitbang); spi_bitbang_stop(&sp->bitbang);

4
target/linux/ar71xx/patches-3.2/206-spi-ath79-add-shutdown-handler.patch
View file

@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/spi/spi-ath79.c --- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c +++ b/drivers/spi/spi-ath79.c
@@ -265,7 +265,7 @@ err_put_master: @@ -262,7 +262,7 @@ err_put_master:
return ret; return ret;
} }
@ -19,7 +19,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
{ {
struct ath79_spi *sp = platform_get_drvdata(pdev); struct ath79_spi *sp = platform_get_drvdata(pdev);
@@ -274,13 +274,23 @@ static __devexit int ath79_spi_remove(st @@ -271,13 +271,23 @@ static __devexit int ath79_spi_remove(st
iounmap(sp->base); iounmap(sp->base);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
spi_master_put(sp->bitbang.master); spi_master_put(sp->bitbang.master);

15
target/linux/ar71xx/patches-3.2/207-spi-ath79-make-chipselect-logic-more-flexible.patch
View file

@ -77,9 +77,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
} }
static void ath79_spi_enable(struct ath79_spi *sp) static void ath79_spi_enable(struct ath79_spi *sp)
@@ -114,24 +118,30 @@ static int ath79_spi_setup_cs(struct spi @@ -113,24 +117,30 @@ static void ath79_spi_disable(struct ath
static int ath79_spi_setup_cs(struct spi_device *spi)
{ {
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
struct ath79_spi_controller_data *cdata; struct ath79_spi_controller_data *cdata;
+ unsigned long flags; + unsigned long flags;
int status; int status;
@ -112,16 +112,15 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
} }
return status; return status;
@@ -139,11 +149,15 @@ static int ath79_spi_setup_cs(struct spi @@ -138,9 +148,15 @@ static int ath79_spi_setup_cs(struct spi
static void ath79_spi_cleanup_cs(struct spi_device *spi) static void ath79_spi_cleanup_cs(struct spi_device *spi)
{ {
- struct ath79_spi *sp = ath79_spidev_to_sp(spi);
+ struct ath79_spi_controller_data *cdata = spi->controller_data;
- if (spi->chip_select) { - if (spi->chip_select) {
- struct ath79_spi_controller_data *cdata = spi->controller_data; - struct ath79_spi_controller_data *cdata = spi->controller_data;
- gpio_free(cdata->gpio); - gpio_free(cdata->gpio);
+ struct ath79_spi_controller_data *cdata = spi->controller_data;
+
+ switch (cdata->cs_type) { + switch (cdata->cs_type) {
+ case ATH79_SPI_CS_TYPE_INTERNAL: + case ATH79_SPI_CS_TYPE_INTERNAL:
+ /* nothing to do */ + /* nothing to do */
@ -132,7 +131,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
} }
} }
@@ -209,6 +223,10 @@ static __devinit int ath79_spi_probe(str @@ -206,6 +222,10 @@ static __devinit int ath79_spi_probe(str
struct resource *r; struct resource *r;
int ret; int ret;
@ -143,7 +142,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
master = spi_alloc_master(&pdev->dev, sizeof(*sp)); master = spi_alloc_master(&pdev->dev, sizeof(*sp));
if (master == NULL) { if (master == NULL) {
dev_err(&pdev->dev, "failed to allocate spi master\n"); dev_err(&pdev->dev, "failed to allocate spi master\n");
@@ -218,17 +236,10 @@ static __devinit int ath79_spi_probe(str @@ -215,17 +235,10 @@ static __devinit int ath79_spi_probe(str
sp = spi_master_get_devdata(master); sp = spi_master_get_devdata(master);
platform_set_drvdata(pdev, sp); platform_set_drvdata(pdev, sp);