Commit 1d6dc068 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Arnd Bergmann

ARM: at91/nand: use gpio_is_valid to check the gpio

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
parent 53a33bde
...@@ -113,7 +113,7 @@ static int cpu_has_dma(void) ...@@ -113,7 +113,7 @@ static int cpu_has_dma(void)
*/ */
static void atmel_nand_enable(struct atmel_nand_host *host) static void atmel_nand_enable(struct atmel_nand_host *host)
{ {
if (host->board->enable_pin) if (gpio_is_valid(host->board->enable_pin))
gpio_set_value(host->board->enable_pin, 0); gpio_set_value(host->board->enable_pin, 0);
} }
...@@ -122,7 +122,7 @@ static void atmel_nand_enable(struct atmel_nand_host *host) ...@@ -122,7 +122,7 @@ static void atmel_nand_enable(struct atmel_nand_host *host)
*/ */
static void atmel_nand_disable(struct atmel_nand_host *host) static void atmel_nand_disable(struct atmel_nand_host *host)
{ {
if (host->board->enable_pin) if (gpio_is_valid(host->board->enable_pin))
gpio_set_value(host->board->enable_pin, 1); gpio_set_value(host->board->enable_pin, 1);
} }
...@@ -492,7 +492,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) ...@@ -492,7 +492,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
nand_chip->IO_ADDR_W = host->io_base; nand_chip->IO_ADDR_W = host->io_base;
nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl; nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl;
if (host->board->rdy_pin) if (gpio_is_valid(host->board->rdy_pin))
nand_chip->dev_ready = atmel_nand_device_ready; nand_chip->dev_ready = atmel_nand_device_ready;
regs = platform_get_resource(pdev, IORESOURCE_MEM, 1); regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
...@@ -530,7 +530,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) ...@@ -530,7 +530,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, host);
atmel_nand_enable(host); atmel_nand_enable(host);
if (host->board->det_pin) { if (gpio_is_valid(host->board->det_pin)) {
if (gpio_get_value(host->board->det_pin)) { if (gpio_get_value(host->board->det_pin)) {
printk(KERN_INFO "No SmartMedia card inserted.\n"); printk(KERN_INFO "No SmartMedia card inserted.\n");
res = -ENXIO; res = -ENXIO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment