diff options
author | Azael Avalos <coproscefalo@gmail.com> | 2015-02-10 23:43:59 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2015-02-11 21:17:18 -0800 |
commit | 9d3098481934a421ce8b1ce230d22e49f38a2a0b (patch) | |
tree | f29df1934d4b95271b4af6224e51b4d743f2d4a2 | |
parent | 9bd1213b12debacd7db26108bd8b7bb0a5d772a9 (diff) | |
download | op-kernel-dev-9d3098481934a421ce8b1ce230d22e49f38a2a0b.zip op-kernel-dev-9d3098481934a421ce8b1ce230d22e49f38a2a0b.tar.gz |
toshiba_acpi: Drop the toshiba_ prefix from sysfs function names
This patch removes the toshiba_ prefix from all the sysfs function
names and adapted the code according to coding style.
Also a few functions were renamed to match the sysfs entry, as this
patch is a preparation for the next patch to switch to
DEVICE_ATTR_{RO, RW, WO} macros.
Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 164 |
1 files changed, 75 insertions, 89 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index c4f9d81..f66e0aa 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -1676,15 +1676,15 @@ static const struct backlight_ops toshiba_backlight_data = { /* * Sysfs files */ -static ssize_t toshiba_version_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t version_show(struct device *dev, + struct device_attribute *attr, char *buf) { return sprintf(buf, "%s\n", TOSHIBA_ACPI_VERSION); } -static ssize_t toshiba_fan_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t fan_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 result; @@ -1707,8 +1707,8 @@ static ssize_t toshiba_fan_store(struct device *dev, return count; } -static ssize_t toshiba_fan_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t fan_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 value; @@ -1721,9 +1721,9 @@ static ssize_t toshiba_fan_show(struct device *dev, return sprintf(buf, "%d\n", value); } -static ssize_t toshiba_kbd_bl_mode_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t kbd_backlight_mode_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int mode; @@ -1778,9 +1778,9 @@ static ssize_t toshiba_kbd_bl_mode_store(struct device *dev, return count; } -static ssize_t toshiba_kbd_bl_mode_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t kbd_backlight_mode_show(struct device *dev, + struct device_attribute *attr, + char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 time; @@ -1791,18 +1791,17 @@ static ssize_t toshiba_kbd_bl_mode_show(struct device *dev, return sprintf(buf, "%i\n", time & SCI_KBD_MODE_MASK); } -static ssize_t toshiba_kbd_type_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t kbd_type_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); return sprintf(buf, "%d\n", toshiba->kbd_type); } -static ssize_t toshiba_available_kbd_modes_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t available_kbd_modes_show(struct device *dev, + struct device_attribute *attr, + char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); @@ -1814,9 +1813,9 @@ static ssize_t toshiba_available_kbd_modes_show(struct device *dev, SCI_KBD_MODE_AUTO, SCI_KBD_MODE_ON, SCI_KBD_MODE_OFF); } -static ssize_t toshiba_kbd_bl_timeout_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t kbd_backlight_timeout_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int time; @@ -1857,9 +1856,9 @@ static ssize_t toshiba_kbd_bl_timeout_store(struct device *dev, return count; } -static ssize_t toshiba_kbd_bl_timeout_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t kbd_backlight_timeout_show(struct device *dev, + struct device_attribute *attr, + char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 time; @@ -1870,9 +1869,9 @@ static ssize_t toshiba_kbd_bl_timeout_show(struct device *dev, return sprintf(buf, "%i\n", time >> HCI_MISC_SHIFT); } -static ssize_t toshiba_touchpad_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t touchpad_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int state; @@ -1892,8 +1891,8 @@ static ssize_t toshiba_touchpad_store(struct device *dev, return count; } -static ssize_t toshiba_touchpad_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t touchpad_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 state; @@ -1906,8 +1905,8 @@ static ssize_t toshiba_touchpad_show(struct device *dev, return sprintf(buf, "%i\n", state); } -static ssize_t toshiba_position_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t position_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 xyval, zval, tmp; @@ -1927,9 +1926,8 @@ static ssize_t toshiba_position_show(struct device *dev, return sprintf(buf, "%d %d %d\n", x, y, z); } -static ssize_t toshiba_usb_sleep_charge_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t usb_sleep_charge_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 mode; @@ -1942,9 +1940,9 @@ static ssize_t toshiba_usb_sleep_charge_show(struct device *dev, return sprintf(buf, "%x\n", mode & SCI_USB_CHARGE_MODE_MASK); } -static ssize_t toshiba_usb_sleep_charge_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t usb_sleep_charge_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 mode; @@ -2038,9 +2036,8 @@ static ssize_t sleep_functions_on_battery_store(struct device *dev, return count; } -static ssize_t toshiba_usb_rapid_charge_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t usb_rapid_charge_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 state; @@ -2053,9 +2050,9 @@ static ssize_t toshiba_usb_rapid_charge_show(struct device *dev, return sprintf(buf, "%d\n", state); } -static ssize_t toshiba_usb_rapid_charge_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t usb_rapid_charge_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int state; @@ -2074,9 +2071,8 @@ static ssize_t toshiba_usb_rapid_charge_store(struct device *dev, return count; } -static ssize_t toshiba_usb_sleep_music_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t usb_sleep_music_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 state; @@ -2089,9 +2085,9 @@ static ssize_t toshiba_usb_sleep_music_show(struct device *dev, return sprintf(buf, "%d\n", state); } -static ssize_t toshiba_usb_sleep_music_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t usb_sleep_music_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int state; @@ -2110,9 +2106,8 @@ static ssize_t toshiba_usb_sleep_music_store(struct device *dev, return count; } -static ssize_t toshiba_kbd_function_keys_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t kbd_function_keys_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int mode; @@ -2125,9 +2120,9 @@ static ssize_t toshiba_kbd_function_keys_show(struct device *dev, return sprintf(buf, "%d\n", mode); } -static ssize_t toshiba_kbd_function_keys_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t kbd_function_keys_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int mode; @@ -2152,9 +2147,8 @@ static ssize_t toshiba_kbd_function_keys_store(struct device *dev, return count; } -static ssize_t toshiba_panel_power_on_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t panel_power_on_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 state; @@ -2167,9 +2161,9 @@ static ssize_t toshiba_panel_power_on_show(struct device *dev, return sprintf(buf, "%d\n", state); } -static ssize_t toshiba_panel_power_on_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t panel_power_on_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int state; @@ -2190,9 +2184,8 @@ static ssize_t toshiba_panel_power_on_store(struct device *dev, return count; } -static ssize_t toshiba_usb_three_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t usb_three_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); u32 state; @@ -2205,9 +2198,9 @@ static ssize_t toshiba_usb_three_show(struct device *dev, return sprintf(buf, "%d\n", state); } -static ssize_t toshiba_usb_three_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t usb_three_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev); int state; @@ -2232,39 +2225,32 @@ static ssize_t toshiba_usb_three_store(struct device *dev, return count; } -static DEVICE_ATTR(version, S_IRUGO, toshiba_version_show, NULL); -static DEVICE_ATTR(fan, S_IRUGO | S_IWUSR, - toshiba_fan_show, toshiba_fan_store); +static DEVICE_ATTR(version, S_IRUGO, version_show, NULL); +static DEVICE_ATTR(fan, S_IRUGO | S_IWUSR, fan_show, fan_store); static DEVICE_ATTR(kbd_backlight_mode, S_IRUGO | S_IWUSR, - toshiba_kbd_bl_mode_show, toshiba_kbd_bl_mode_store); -static DEVICE_ATTR(kbd_type, S_IRUGO, toshiba_kbd_type_show, NULL); + kbd_backlight_mode_show, kbd_backlight_mode_store); +static DEVICE_ATTR(kbd_type, S_IRUGO, kbd_type_show, NULL); static DEVICE_ATTR(available_kbd_modes, S_IRUGO, - toshiba_available_kbd_modes_show, NULL); + available_kbd_modes_show, NULL); static DEVICE_ATTR(kbd_backlight_timeout, S_IRUGO | S_IWUSR, - toshiba_kbd_bl_timeout_show, toshiba_kbd_bl_timeout_store); -static DEVICE_ATTR(touchpad, S_IRUGO | S_IWUSR, - toshiba_touchpad_show, toshiba_touchpad_store); -static DEVICE_ATTR(position, S_IRUGO, toshiba_position_show, NULL); + kbd_backlight_timeout_show, kbd_backlight_timeout_store); +static DEVICE_ATTR(touchpad, S_IRUGO | S_IWUSR, touchpad_show, touchpad_store); +static DEVICE_ATTR(position, S_IRUGO, position_show, NULL); static DEVICE_ATTR(usb_sleep_charge, S_IRUGO | S_IWUSR, - toshiba_usb_sleep_charge_show, - toshiba_usb_sleep_charge_store); + usb_sleep_charge_show, usb_sleep_charge_store); static DEVICE_ATTR(sleep_functions_on_battery, S_IRUGO | S_IWUSR, sleep_functions_on_battery_show, sleep_functions_on_battery_store); static DEVICE_ATTR(usb_rapid_charge, S_IRUGO | S_IWUSR, - toshiba_usb_rapid_charge_show, - toshiba_usb_rapid_charge_store); + usb_rapid_charge_show, usb_rapid_charge_store); static DEVICE_ATTR(usb_sleep_music, S_IRUGO | S_IWUSR, - toshiba_usb_sleep_music_show, - toshiba_usb_sleep_music_store); + usb_sleep_music_show, usb_sleep_music_store); static DEVICE_ATTR(kbd_function_keys, S_IRUGO | S_IWUSR, - toshiba_kbd_function_keys_show, - toshiba_kbd_function_keys_store); + kbd_function_keys_show, kbd_function_keys_store); static DEVICE_ATTR(panel_power_on, S_IRUGO | S_IWUSR, - toshiba_panel_power_on_show, - toshiba_panel_power_on_store); + panel_power_on_show, panel_power_on_store); static DEVICE_ATTR(usb_three, S_IRUGO | S_IWUSR, - toshiba_usb_three_show, toshiba_usb_three_store); + usb_three_show, usb_three_store); static struct attribute *toshiba_attributes[] = { &dev_attr_version.attr, |