On Thu, Aug 25, 2016 at 11:52:01AM +0200, Daniel Wagner wrote: > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c > index 22d1760..f397026 100644 > --- a/drivers/base/firmware_class.c > +++ b/drivers/base/firmware_class.c > @@ -91,10 +91,13 @@ static inline bool fw_is_builtin_firmware(const struct > firmware *fw) > } > #endif > > +#ifdef CONFIG_FW_LOADER_USER_HELPER > + > enum { > + FW_STATUS_UNKNOWN, > FW_STATUS_LOADING, > FW_STATUS_DONE, > - FW_STATUS_ABORT, > + FW_STATUS_ABORTED, > }; > > static int loading_timeout = 60; /* In seconds */
<-- snip --> > +#else /* CONFIG_FW_LOADER_USER_HELPER */ > + > +static int loading_timeout = 60; > +#define firmware_loading_timeout() (loading_timeout * HZ) > + > +#define fw_status_wait_timeout(fw_st, long) 0 The timeout makes 0 sense for when !CONFIG_FW_LOADER_USER_HELPER so can we do away with adding a silly 60 value to an int here and the silly value of (loading_timeout * HZ) ? Its not used so its not clear to me why this is here. Luis