]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: unisys: visorbus: move toolaction functions to remove prototypes
authorDavid Kershner <david.kershner@unisys.com>
Mon, 19 Sep 2016 21:09:29 +0000 (17:09 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Sep 2016 11:26:21 +0000 (13:26 +0200)
The toolchain functions show and store needed to be moved so the prototypes
were no longer needed.

Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visorbus/visorchipset.c

index 7dcf0b3a1017c9b472974e25f54821d72e3453c6..568ff9ea0bc344466c8e134044c19aacae5602ea 100644 (file)
@@ -185,10 +185,37 @@ static dev_t major_dev = -1; /*< indicates major num for device */
 
 /* prototypes for attributes */
 static ssize_t toolaction_show(struct device *dev,
-                              struct device_attribute *attr, char *buf);
+                              struct device_attribute *attr,
+                              char *buf)
+{
+       u8 tool_action = 0;
+
+       visorchannel_read(controlvm_channel,
+                         offsetof(struct spar_controlvm_channel_protocol,
+                                  tool_action), &tool_action, sizeof(u8));
+       return scnprintf(buf, PAGE_SIZE, "%u\n", tool_action);
+}
+
 static ssize_t toolaction_store(struct device *dev,
                                struct device_attribute *attr,
-                               const char *buf, size_t count);
+                               const char *buf, size_t count)
+{
+       u8 tool_action;
+       int ret;
+
+       if (kstrtou8(buf, 10, &tool_action))
+               return -EINVAL;
+
+       ret = visorchannel_write
+               (controlvm_channel,
+                offsetof(struct spar_controlvm_channel_protocol,
+                         tool_action),
+                &tool_action, sizeof(u8));
+
+       if (ret)
+               return ret;
+       return count;
+}
 static DEVICE_ATTR_RW(toolaction);
 
 static ssize_t boottotool_show(struct device *dev,
@@ -431,39 +458,6 @@ parser_string_get(struct parser_context *ctx)
        return value;
 }
 
-static ssize_t toolaction_show(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-       u8 tool_action = 0;
-
-       visorchannel_read(controlvm_channel,
-                         offsetof(struct spar_controlvm_channel_protocol,
-                                  tool_action), &tool_action, sizeof(u8));
-       return scnprintf(buf, PAGE_SIZE, "%u\n", tool_action);
-}
-
-static ssize_t toolaction_store(struct device *dev,
-                               struct device_attribute *attr,
-                               const char *buf, size_t count)
-{
-       u8 tool_action;
-       int ret;
-
-       if (kstrtou8(buf, 10, &tool_action))
-               return -EINVAL;
-
-       ret = visorchannel_write
-               (controlvm_channel,
-                offsetof(struct spar_controlvm_channel_protocol,
-                         tool_action),
-                &tool_action, sizeof(u8));
-
-       if (ret)
-               return ret;
-       return count;
-}
-
 static ssize_t boottotool_show(struct device *dev,
                               struct device_attribute *attr,
                               char *buf)