mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-21 16:29:59 +00:00
Code Issues Releases Wiki Activity

mtd: atmel_nand: remove #if defined(CONFIG_OF) around OF-specific code

Browse source 
Since the of specific code are declared in <linux/of_mtd.h> regardless
of CONFIG_OF. Remove the #if defined(CONFIG_OF) guard and use an
IS_ENABLED(CONFIG_OF) instead.

Thanks to Ezequiel Garcia's for this protype.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Josh Wu 2013-09-18 11:31:19 +08:00 committed by Brian Norris
parent 86bc7bddc9
commit e9d8da807d
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/mtd/nand/atmel_nand.c
View file

@ -1449,7 +1449,6 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)
ecc_writel(host->ecc, CR, ATMEL_ECC_RST); ecc_writel(host->ecc, CR, ATMEL_ECC_RST);
} }
#if defined(CONFIG_OF)
static int atmel_of_init_port(struct atmel_nand_host *host, static int atmel_of_init_port(struct atmel_nand_host *host,
struct device_node *np) struct device_node *np)
{ {
@ -1457,7 +1456,7 @@ static int atmel_of_init_port(struct atmel_nand_host *host,
u32 offset[2]; u32 offset[2];
int ecc_mode; int ecc_mode;
struct atmel_nand_data *board = &host->board; struct atmel_nand_data *board = &host->board;
enum of_gpio_flags flags; enum of_gpio_flags flags = 0;
if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) { if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) {
if (val >= 32) { if (val >= 32) {
@ -1540,13 +1539,6 @@ static int atmel_of_init_port(struct atmel_nand_host *host,
return 0; return 0;
} }
#else
static int atmel_of_init_port(struct atmel_nand_host *host,
struct device_node *np)
{
return -EINVAL;
}
#endif
static int __init atmel_hw_nand_init_params(struct platform_device *pdev, static int __init atmel_hw_nand_init_params(struct platform_device *pdev,
struct atmel_nand_host *host) struct atmel_nand_host *host)
@ -2019,7 +2011,8 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
mtd = &host->mtd; mtd = &host->mtd;
nand_chip = &host->nand_chip; nand_chip = &host->nand_chip;
host->dev = &pdev->dev; host->dev = &pdev->dev;
if (pdev->dev.of_node) { if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {
/* Only when CONFIG_OF is enabled of_node can be parsed */
res = atmel_of_init_port(host, pdev->dev.of_node); res = atmel_of_init_port(host, pdev->dev.of_node);
if (res) if (res)
goto err_nand_ioremap; goto err_nand_ioremap;
@ -2207,14 +2200,12 @@ static int __exit atmel_nand_remove(struct platform_device *pdev)
return 0; return 0;
} }
#if defined(CONFIG_OF)
static const struct of_device_id atmel_nand_dt_ids[] = { static const struct of_device_id atmel_nand_dt_ids[] = {
{ .compatible = "atmel,at91rm9200-nand" }, { .compatible = "atmel,at91rm9200-nand" },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, atmel_nand_dt_ids); MODULE_DEVICE_TABLE(of, atmel_nand_dt_ids);
#endif
static int atmel_nand_nfc_probe(struct platform_device *pdev) static int atmel_nand_nfc_probe(struct platform_device *pdev)
{ {
@ -2253,12 +2244,10 @@ static int atmel_nand_nfc_probe(struct platform_device *pdev)
return 0; return 0;
} }
#if defined(CONFIG_OF)
static struct of_device_id atmel_nand_nfc_match[] = { static struct of_device_id atmel_nand_nfc_match[] = {
{ .compatible = "atmel,sama5d3-nfc" }, { .compatible = "atmel,sama5d3-nfc" },
{ /* sentinel */ } { /* sentinel */ }
}; };
#endif
static struct platform_driver atmel_nand_nfc_driver = { static struct platform_driver atmel_nand_nfc_driver = {
.driver = { .driver = {