forked from Minki/linux
ARM: at91/nand: use gpio_is_valid to check the gpio
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
parent
53a33bded0
commit
1d6dc0683d
@ -113,7 +113,7 @@ static int cpu_has_dma(void)
|
||||
*/
|
||||
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);
|
||||
}
|
||||
|
||||
@ -122,7 +122,7 @@ static void atmel_nand_enable(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);
|
||||
}
|
||||
|
||||
@ -492,7 +492,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
|
||||
nand_chip->IO_ADDR_W = host->io_base;
|
||||
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;
|
||||
|
||||
regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
||||
@ -530,7 +530,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
|
||||
platform_set_drvdata(pdev, 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)) {
|
||||
printk(KERN_INFO "No SmartMedia card inserted.\n");
|
||||
res = -ENXIO;
|
||||
|
Loading…
Reference in New Issue
Block a user