Skip to content

Commit

Permalink
pinctrl: remove unneeded #ifdef around declarations
Browse files Browse the repository at this point in the history
What is the point in surrounding the whole of declarations with
ifdef like this?

  #ifdef CONFIG_FOO
  int foo(void);
  #endif

If CONFIG_FOO is not defined, all callers of foo() will fail
with implicit declaration errors since the top Makefile adds
-Werror-implicit-function-declaration to KBUILD_CFLAGS.

This breaks the build earlier when you are doing something wrong.
That's it.

Anyway, it will fail to link since the definition of foo() is not
compiled.

In summary, these ifdef are unneeded.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Masahiro Yamada authored and Linus Walleij committed Jun 25, 2019
1 parent d9c238c commit ec6516b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 26 deletions.
20 changes: 6 additions & 14 deletions include/linux/pinctrl/pinconf-generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
#ifndef __LINUX_PINCTRL_PINCONF_GENERIC_H
#define __LINUX_PINCTRL_PINCONF_GENERIC_H

#include <linux/device.h>
#include <linux/pinctrl/machine.h>

struct pinctrl_dev;
struct pinctrl_map;

/**
* enum pin_config_param - possible pin configuration parameters
* @PIN_CONFIG_BIAS_BUS_HOLD: the pin will be set to weakly latch so that it
Expand Down Expand Up @@ -159,9 +165,6 @@ static inline unsigned long pinconf_to_config_packed(enum pin_config_param param
return PIN_CONF_PACKED(param, argument);
}

#ifdef CONFIG_GENERIC_PINCONF

#ifdef CONFIG_DEBUG_FS
#define PCONFDUMP(a, b, c, d) { \
.param = a, .display = b, .format = c, .has_arg = d \
}
Expand All @@ -172,14 +175,6 @@ struct pin_config_item {
const char * const format;
bool has_arg;
};
#endif /* CONFIG_DEBUG_FS */

#ifdef CONFIG_OF

#include <linux/device.h>
#include <linux/pinctrl/machine.h>
struct pinctrl_dev;
struct pinctrl_map;

struct pinconf_generic_params {
const char * const property;
Expand Down Expand Up @@ -224,8 +219,5 @@ static inline int pinconf_generic_dt_node_to_map_all(
return pinconf_generic_dt_node_to_map(pctldev, np_config, map, num_maps,
PIN_MAP_TYPE_INVALID);
}
#endif

#endif /* CONFIG_GENERIC_PINCONF */

#endif /* __LINUX_PINCTRL_PINCONF_GENERIC_H */
4 changes: 0 additions & 4 deletions include/linux/pinctrl/pinconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#ifndef __LINUX_PINCTRL_PINCONF_H
#define __LINUX_PINCTRL_PINCONF_H

#ifdef CONFIG_PINCONF

#include <linux/types.h>

struct pinctrl_dev;
Expand Down Expand Up @@ -67,6 +65,4 @@ struct pinconf_ops {
unsigned long config);
};

#endif

#endif /* __LINUX_PINCTRL_PINCONF_H */
4 changes: 0 additions & 4 deletions include/linux/pinctrl/pinctrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#ifndef __LINUX_PINCTRL_PINCTRL_H
#define __LINUX_PINCTRL_PINCTRL_H

#ifdef CONFIG_PINCTRL

#include <linux/radix-tree.h>
#include <linux/list.h>
#include <linux/seq_file.h>
Expand Down Expand Up @@ -203,6 +201,4 @@ extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev);
extern const char *pinctrl_dev_get_devname(struct pinctrl_dev *pctldev);
extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev);

#endif /* !CONFIG_PINCTRL */

#endif /* __LINUX_PINCTRL_PINCTRL_H */
4 changes: 0 additions & 4 deletions include/linux/pinctrl/pinmux.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#include <linux/seq_file.h>
#include <linux/pinctrl/pinctrl.h>

#ifdef CONFIG_PINMUX

struct pinctrl_dev;

/**
Expand Down Expand Up @@ -85,6 +83,4 @@ struct pinmux_ops {
bool strict;
};

#endif /* CONFIG_PINMUX */

#endif /* __LINUX_PINCTRL_PINMUX_H */

0 comments on commit ec6516b

Please sign in to comment.