hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections 

All functions and data types used by OF-specific code paths are declared
in <linux/of.h> regardless of CONFIG_OF. Replace the #ifdef CONFIG_OF
guard with a if(IS_ENABLED(CONFIG_OF)) and let the compiler optimize
the unused code away.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Laurent Pinchart 2013-06-18 12:29:49 +02:00 committed by Simon Horman
parent b559c3e8e7
commit e305062e94
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpio/gpio-rcar.c
View File

@ -279,16 +279,13 @@ static struct irq_domain_ops gpio_rcar_irq_domain_ops = {
static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p) static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p)
{ {
struct gpio_rcar_config *pdata = p->pdev->dev.platform_data; struct gpio_rcar_config *pdata = p->pdev->dev.platform_data;
#ifdef CONFIG_OF
struct device_node *np = p->pdev->dev.of_node; struct device_node *np = p->pdev->dev.of_node;
struct of_phandle_args args; struct of_phandle_args args;
int ret; int ret;
#endif
if (pdata) if (pdata) {
p->config = *pdata; p->config = *pdata;
#ifdef CONFIG_OF } else if (IS_ENABLED(CONFIG_OF) && np) {
else if (np) {
ret = of_parse_phandle_with_args(np, "gpio-ranges", ret = of_parse_phandle_with_args(np, "gpio-ranges",
"#gpio-range-cells", 0, &args); "#gpio-range-cells", 0, &args);
p->config.number_of_pins = ret == 0 && args.args_count == 3 p->config.number_of_pins = ret == 0 && args.args_count == 3
@ -296,7 +293,6 @@ static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p)
: RCAR_MAX_GPIO_PER_BANK; : RCAR_MAX_GPIO_PER_BANK;
p->config.gpio_base = -1; p->config.gpio_base = -1;
} }
#endif
if (p->config.number_of_pins == 0 || if (p->config.number_of_pins == 0 ||
p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) { p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) {