| Message ID | 1418400022-6264-1-git-send-email-tklauser@distanz.ch |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 2014-12-12 at 17:00:22 +0100, Tobias Klauser <tklauser@distanz.ch> wrote:
> If GPIOLIB=n the following build error occurs:
Sorry, I forgot to paste the following error message here:
drivers/net/ethernet/smsc/smc91x.c: In function 'try_toggle_control_gpio':
drivers/net/ethernet/smsc/smc91x.c:2204:2: error: implicit declaration of function 'devm_gpiod_get_index' [-Werror=implicit-function-declaration]
drivers/net/ethernet/smsc/smc91x.c:2204:7: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/net/ethernet/smsc/smc91x.c:2213:2: error: implicit declaration of function 'gpiod_direction_output' [-Werror=implicit-function-declaration]
drivers/net/ethernet/smsc/smc91x.c:2216:3: error: implicit declaration of function 'devm_gpiod_put' [-Werror=implicit-function-declaration]
drivers/net/ethernet/smsc/smc91x.c:2222:2: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration]
I'll send an updated patch. Please disregard this one.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 6cc3cf6..050bcb6 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -2193,6 +2193,7 @@ MODULE_DEVICE_TABLE(of, smc91x_match); /** * of_try_set_control_gpio - configure a gpio if it exists */ +#ifdef CONFIG_GPIOLIB static int try_toggle_control_gpio(struct device *dev, struct gpio_desc **desc, const char *name, int index, @@ -2224,7 +2225,16 @@ static int try_toggle_control_gpio(struct device *dev, return 0; } -#endif +#else +static int try_toggle_control_gpio(struct device *dev, + struct gpio_desc **desc, + const char *name, int index, + int value, unsigned int nsdelay) +{ + return 0; +} +#endif /* CONFIG_GPIOLIB */ +#endif /* CONFIG_OF */ /* * smc_init(void)
If GPIOLIB=n the following build error occurs: Since the toggling of the GPIOs is an optional feature, define try_toggle_control_gpio only if GPIOLIB is enabled. Fixes: 7d2911c4381 ("net: smc91x: Fix gpios for device tree based booting") Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- drivers/net/ethernet/smsc/smc91x.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)