Re: [PATCH 4/6] spi/ath79: use gpio_request_one

[Grant Likely]

On Thu, 27 Dec 2012 10:42:27 +0100, Gabor Juhos juh...@openwrt.org wrote:
 Use gpio_request_one() instead of multiple gpiolib calls.
 
 Signed-off-by: Gabor Juhos juh...@openwrt.org

Applied, thanks.

g.

 ---
  drivers/spi/spi-ath79.c |   22 +++---
  1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
 index a725e62..19d539e 100644
 --- a/drivers/spi/spi-ath79.c
 +++ b/drivers/spi/spi-ath79.c
 @@ -100,6 +100,7 @@ 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;
 + int status;
  
   cdata = spi-controller_data;
   if (spi-chip_select  !cdata)
 @@ -115,22 +116,21 @@ static int ath79_spi_setup_cs(struct spi_device *spi)
   /* TODO: setup speed? */
   ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
  
 + status = 0;
   if (spi-chip_select) {
 - int status = 0;
 + unsigned long flags;
  
 - status = gpio_request(cdata-gpio, dev_name(spi-dev));
 - if (status)
 - return status;
 + flags = GPIOF_DIR_OUT;
 + if (spi-mode  SPI_CS_HIGH)
 + flags |= GPIOF_INIT_HIGH;
 + else
 + flags |= GPIOF_INIT_LOW;
  
 - status = gpio_direction_output(cdata-gpio,
 -spi-mode  SPI_CS_HIGH);
 - if (status) {
 - gpio_free(cdata-gpio);
 - return status;
 - }
 + status = gpio_request_one(cdata-gpio, flags,
 +   dev_name(spi-dev));
   }
  
 - return 0;
 + return status;
  }
  
  static void ath79_spi_cleanup_cs(struct spi_device *spi)
 -- 
 1.7.10
 

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.

--
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general

[PATCH 4/6] spi/ath79: use gpio_request_one

[Gabor Juhos]

Use gpio_request_one() instead of multiple gpiolib calls.

Signed-off-by: Gabor Juhos juh...@openwrt.org
---
 drivers/spi/spi-ath79.c |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index a725e62..19d539e 100644
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -100,6 +100,7 @@ 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;
+   int status;
 
cdata = spi-controller_data;
if (spi-chip_select  !cdata)
@@ -115,22 +116,21 @@ static int ath79_spi_setup_cs(struct spi_device *spi)
/* TODO: setup speed? */
ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
 
+   status = 0;
if (spi-chip_select) {
-   int status = 0;
+   unsigned long flags;
 
-   status = gpio_request(cdata-gpio, dev_name(spi-dev));
-   if (status)
-   return status;
+   flags = GPIOF_DIR_OUT;
+   if (spi-mode  SPI_CS_HIGH)
+   flags |= GPIOF_INIT_HIGH;
+   else
+   flags |= GPIOF_INIT_LOW;
 
-   status = gpio_direction_output(cdata-gpio,
-  spi-mode  SPI_CS_HIGH);
-   if (status) {
-   gpio_free(cdata-gpio);
-   return status;
-   }
+   status = gpio_request_one(cdata-gpio, flags,
+ dev_name(spi-dev));
}
 
-   return 0;
+   return status;
 }
 
 static void ath79_spi_cleanup_cs(struct spi_device *spi)
-- 
1.7.10


--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general