From 49f01bd28fce193a0abcfb07e9ea965d41e43b99 Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Tue, 26 Mar 2013 10:27:35 +0100 Subject: [PATCH] --- yaml --- r: 365216 b: refs/heads/master c: 5c725b34d438fdd3c528673a5f53f4b07f879c68 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-s3c64xx.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 76fa4a412898..2b5918abd387 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b66c7730027509620ced3c7ebc84e28f623ebe9a +refs/heads/master: 5c725b34d438fdd3c528673a5f53f4b07f879c68 diff --git a/trunk/drivers/spi/spi-s3c64xx.c b/trunk/drivers/spi/spi-s3c64xx.c index e862ab8853aa..7f5f8ee68840 100644 --- a/trunk/drivers/spi/spi-s3c64xx.c +++ b/trunk/drivers/spi/spi-s3c64xx.c @@ -817,7 +817,6 @@ static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi) } static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( - struct s3c64xx_spi_driver_data *sdd, struct spi_device *spi) { struct s3c64xx_spi_csinfo *cs; @@ -874,7 +873,7 @@ static int s3c64xx_spi_setup(struct spi_device *spi) sdd = spi_master_get_devdata(spi->master); if (!cs && spi->dev.of_node) { - cs = s3c64xx_get_slave_ctrldata(sdd, spi); + cs = s3c64xx_get_slave_ctrldata(spi); spi->controller_data = cs; }