|
@@ -486,9 +486,8 @@ static struct notifier_block fw_shutdown_nb = {
|
|
|
.notifier_call = fw_shutdown_notify,
|
|
|
};
|
|
|
|
|
|
-static ssize_t firmware_timeout_show(struct class *class,
|
|
|
- struct class_attribute *attr,
|
|
|
- char *buf)
|
|
|
+static ssize_t timeout_show(struct class *class, struct class_attribute *attr,
|
|
|
+ char *buf)
|
|
|
{
|
|
|
return sprintf(buf, "%d\n", loading_timeout);
|
|
|
}
|
|
@@ -506,9 +505,8 @@ static ssize_t firmware_timeout_show(struct class *class,
|
|
|
*
|
|
|
* Note: zero means 'wait forever'.
|
|
|
**/
|
|
|
-static ssize_t firmware_timeout_store(struct class *class,
|
|
|
- struct class_attribute *attr,
|
|
|
- const char *buf, size_t count)
|
|
|
+static ssize_t timeout_store(struct class *class, struct class_attribute *attr,
|
|
|
+ const char *buf, size_t count)
|
|
|
{
|
|
|
loading_timeout = simple_strtol(buf, NULL, 10);
|
|
|
if (loading_timeout < 0)
|
|
@@ -518,8 +516,7 @@ static ssize_t firmware_timeout_store(struct class *class,
|
|
|
}
|
|
|
|
|
|
static struct class_attribute firmware_class_attrs[] = {
|
|
|
- __ATTR(timeout, S_IWUSR | S_IRUGO,
|
|
|
- firmware_timeout_show, firmware_timeout_store),
|
|
|
+ __ATTR_RW(timeout),
|
|
|
__ATTR_NULL
|
|
|
};
|
|
|
|