Skip to content

Commit

Permalink
toshiba_acpi: Move sysfs function and struct declarations further down
Browse files Browse the repository at this point in the history 
Commit 93f8c16 ("toshiba_acpi: Support new keyboard backlight
type") moved all the sysfs structs and function declarations further
up in order to make use of sysfs_update_group, however,
commit 8054690 ("toshiba_acpi: Add keyboard backlight mode
change event") made use of that function unnecesary.

This patch moves all the sysfs structs and function declarations
further down, making the file shorther in lines and more readable.

Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
  • Loading branch information
Azael Avalos authored and Darren Hart committed Feb 12, 2015
1 parent 15667b2 commit 9bd1213
Showing 1 changed file with 58 additions and 138 deletions.
196 changes: 58 additions & 138 deletions drivers/platform/x86/toshiba_acpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1676,144 +1676,6 @@ 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 toshiba_fan_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_fan_show(struct device *dev,
struct device_attribute *attr, char *buf);
static ssize_t toshiba_kbd_bl_mode_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_kbd_bl_mode_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_kbd_type_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_available_kbd_modes_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_kbd_bl_timeout_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_kbd_bl_timeout_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_touchpad_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_touchpad_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_position_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_usb_sleep_charge_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_usb_sleep_charge_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t sleep_functions_on_battery_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t sleep_functions_on_battery_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_usb_rapid_charge_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_usb_rapid_charge_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_usb_sleep_music_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_usb_sleep_music_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_kbd_function_keys_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_kbd_function_keys_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_panel_power_on_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_panel_power_on_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count);
static ssize_t toshiba_usb_three_show(struct device *dev,
struct device_attribute *attr,
char *buf);
static ssize_t toshiba_usb_three_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t 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(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);
static DEVICE_ATTR(available_kbd_modes, S_IRUGO,
toshiba_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);
static DEVICE_ATTR(usb_sleep_charge, S_IRUGO | S_IWUSR,
toshiba_usb_sleep_charge_show,
toshiba_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);
static DEVICE_ATTR(usb_sleep_music, S_IRUGO | S_IWUSR,
toshiba_usb_sleep_music_show,
toshiba_usb_sleep_music_store);
static DEVICE_ATTR(kbd_function_keys, S_IRUGO | S_IWUSR,
toshiba_kbd_function_keys_show,
toshiba_kbd_function_keys_store);
static DEVICE_ATTR(panel_power_on, S_IRUGO | S_IWUSR,
toshiba_panel_power_on_show,
toshiba_panel_power_on_store);
static DEVICE_ATTR(usb_three, S_IRUGO | S_IWUSR,
toshiba_usb_three_show, toshiba_usb_three_store);

static struct attribute *toshiba_attributes[] = {
&dev_attr_version.attr,
&dev_attr_fan.attr,
&dev_attr_kbd_backlight_mode.attr,
&dev_attr_kbd_type.attr,
&dev_attr_available_kbd_modes.attr,
&dev_attr_kbd_backlight_timeout.attr,
&dev_attr_touchpad.attr,
&dev_attr_position.attr,
&dev_attr_usb_sleep_charge.attr,
&dev_attr_sleep_functions_on_battery.attr,
&dev_attr_usb_rapid_charge.attr,
&dev_attr_usb_sleep_music.attr,
&dev_attr_kbd_function_keys.attr,
&dev_attr_panel_power_on.attr,
&dev_attr_usb_three.attr,
NULL,
};

static umode_t toshiba_sysfs_is_visible(struct kobject *,
struct attribute *, int);

static struct attribute_group toshiba_attr_group = {
.is_visible = toshiba_sysfs_is_visible,
.attrs = toshiba_attributes,
};

static ssize_t toshiba_version_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
Expand Down Expand Up @@ -2370,6 +2232,59 @@ 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(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);
static DEVICE_ATTR(available_kbd_modes, S_IRUGO,
toshiba_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);
static DEVICE_ATTR(usb_sleep_charge, S_IRUGO | S_IWUSR,
toshiba_usb_sleep_charge_show,
toshiba_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);
static DEVICE_ATTR(usb_sleep_music, S_IRUGO | S_IWUSR,
toshiba_usb_sleep_music_show,
toshiba_usb_sleep_music_store);
static DEVICE_ATTR(kbd_function_keys, S_IRUGO | S_IWUSR,
toshiba_kbd_function_keys_show,
toshiba_kbd_function_keys_store);
static DEVICE_ATTR(panel_power_on, S_IRUGO | S_IWUSR,
toshiba_panel_power_on_show,
toshiba_panel_power_on_store);
static DEVICE_ATTR(usb_three, S_IRUGO | S_IWUSR,
toshiba_usb_three_show, toshiba_usb_three_store);

static struct attribute *toshiba_attributes[] = {
&dev_attr_version.attr,
&dev_attr_fan.attr,
&dev_attr_kbd_backlight_mode.attr,
&dev_attr_kbd_type.attr,
&dev_attr_available_kbd_modes.attr,
&dev_attr_kbd_backlight_timeout.attr,
&dev_attr_touchpad.attr,
&dev_attr_position.attr,
&dev_attr_usb_sleep_charge.attr,
&dev_attr_sleep_functions_on_battery.attr,
&dev_attr_usb_rapid_charge.attr,
&dev_attr_usb_sleep_music.attr,
&dev_attr_kbd_function_keys.attr,
&dev_attr_panel_power_on.attr,
&dev_attr_usb_three.attr,
NULL,
};

static umode_t toshiba_sysfs_is_visible(struct kobject *kobj,
struct attribute *attr, int idx)
{
Expand Down Expand Up @@ -2405,6 +2320,11 @@ static umode_t toshiba_sysfs_is_visible(struct kobject *kobj,
return exists ? attr->mode : 0;
}

static struct attribute_group toshiba_attr_group = {
.is_visible = toshiba_sysfs_is_visible,
.attrs = toshiba_attributes,
};

/*
* Hotkeys
*/
Expand Down

0 comments on commit 9bd1213

Please sign in to comment.