Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / hwmon / asus_atk0110.c

diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index 00e9851..351d1f4 100644 (file)
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -38,7 +38,8 @@ static const struct dmi_system_id __initconst atk_force_new_if[] = {
        { }
 };
 
-/* Minimum time between readings, enforced in order to avoid
+/*
+ * Minimum time between readings, enforced in order to avoid
  * hogging the CPU.
  */
 #define CACHE_TIME             HZ
@@ -161,7 +162,8 @@ struct atk_sensor_data {
        char const *acpi_name;
 };
 
-/* Return buffer format:
+/*
+ * Return buffer format:
  * [0-3] "value" is valid flag
  * [4-7] value
  * [8- ] unknown stuff on newer mobos
@@ -310,7 +312,8 @@ static union acpi_object *atk_get_pack_member(struct atk_data *data,
 }
 
 
-/* New package format is:
+/*
+ * New package format is:
  * - flag (int)
  *     class - used for de-muxing the request to the correct GITn
  *     type (volt, temp, fan)
@@ -613,7 +616,8 @@ static int atk_read_value_new(struct atk_sensor_data *sensor, u64 *value)
 
        buf = (struct atk_acpi_ret_buffer *)obj->buffer.pointer;
        if (buf->flags == 0) {
-               /* The reading is not valid, possible causes:
+               /*
+                * The reading is not valid, possible causes:
                 * - sensor failure
                 * - enumeration was FUBAR (and we didn't notice)
                 */
@@ -1311,14 +1315,16 @@ static int atk_probe_if(struct atk_data *data)
                dev_dbg(dev, "method " METHOD_WRITE " not found: %s\n",
                                 acpi_format_exception(status));
 
-       /* Check for hwmon methods: first check "old" style methods; note that
+       /*
+        * Check for hwmon methods: first check "old" style methods; note that
         * both may be present: in this case we stick to the old interface;
         * analysis of multiple DSDTs indicates that when both interfaces
         * are present the new one (GGRP/GITM) is not functional.
         */
        if (new_if)
                dev_info(dev, "Overriding interface detection\n");
-       if (data->rtmp_handle && data->rvlt_handle && data->rfan_handle && !new_if)
+       if (data->rtmp_handle &&
+                       data->rvlt_handle && data->rfan_handle && !new_if)
                data->old_interface = true;
        else if (data->enumerate_handle && data->read_handle &&
                        data->write_handle)