Loading drivers/misc/asus-laptop.c +123 −124 Original line number Diff line number Diff line Loading @@ -130,8 +130,7 @@ ASUS_HANDLE(lcd_switch, "\\_SB.PCI0.SBRG.EC0._Q10", /* All new models */ /* Display */ ASUS_HANDLE(display_set, ASUS_HOTK_PREFIX "SDSP"); ASUS_HANDLE(display_get, "\\_SB.PCI0.P0P1.VGA.GETD", /* A6B, A6K A6R A7D F3JM L4R M6R A3G ASUS_HANDLE(display_get, "\\_SB.PCI0.P0P1.VGA.GETD", /* A6B, A6K A6R A7D F3JM L4R M6R A3G M6A M6V VX-1 V6J V6V W3Z */ "\\_SB.PCI0.P0P2.VGA.GETD", /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V S5A M5A z33A W1Jc W2V */ Loading Loading @@ -263,7 +262,8 @@ static int read_acpi_int(acpi_handle handle, const char *method, int *val, return (status == AE_OK) && (out_obj.type == ACPI_TYPE_INTEGER); } static int read_wireless_status(int mask) { static int read_wireless_status(int mask) { int status; if (!wireless_status_handle) Loading @@ -287,8 +287,7 @@ static int read_status(int mask) return (hotk->status & mask) ? 1 : 0; } static void write_status(acpi_handle handle, int out, int mask, int invert) static void write_status(acpi_handle handle, int out, int mask, int invert) { hotk->status = (out) ? (hotk->status | mask) : (hotk->status & ~mask); Loading Loading @@ -535,8 +534,9 @@ static ssize_t show_bluetooth(struct device *dev, return sprintf(buf, "%d\n", read_status(BT_ON)); } static ssize_t store_bluetooth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) static ssize_t store_bluetooth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { return store_status(buf, count, bt_switch_handle, BT_ON, 0); } Loading Loading @@ -567,6 +567,7 @@ static int read_display(void) return value; } /* * Now, *this* one could be more user-friendly, but so far, no-one has * complained. The significance of bits is the same as in store_disp() Loading Loading @@ -724,7 +725,6 @@ static struct platform_driver asuspf_driver = { static struct platform_device *asuspf_device; static void asus_hotk_add_fs(void) { ASUS_SET_DEVICE_ATTR(infos, 0444, show_infos, NULL); Loading Loading @@ -770,7 +770,6 @@ static int asus_handle_init(char *name, acpi_handle *handle, asus_handle_init(#object, &object##_handle, object##_paths, \ ARRAY_SIZE(object##_paths)) /* * This function is used to initialize the hotk with right values. In this * method, we can make all the detection we want, and modify the hotk struct Loading Loading @@ -1048,14 +1047,14 @@ static int asus_backlight_init(struct device * dev) } static int asus_led_register(acpi_handle handle, struct led_classdev * ldev, struct device * dev) struct led_classdev *ldev, struct device *dev) { if (!handle) return 0; return led_classdev_register(dev, ldev); } #define ASUS_LED_REGISTER(object, device) \ asus_led_register(object##_set_handle, &object##_led, device) Loading Loading
drivers/misc/asus-laptop.c +123 −124 Original line number Diff line number Diff line Loading @@ -130,8 +130,7 @@ ASUS_HANDLE(lcd_switch, "\\_SB.PCI0.SBRG.EC0._Q10", /* All new models */ /* Display */ ASUS_HANDLE(display_set, ASUS_HOTK_PREFIX "SDSP"); ASUS_HANDLE(display_get, "\\_SB.PCI0.P0P1.VGA.GETD", /* A6B, A6K A6R A7D F3JM L4R M6R A3G ASUS_HANDLE(display_get, "\\_SB.PCI0.P0P1.VGA.GETD", /* A6B, A6K A6R A7D F3JM L4R M6R A3G M6A M6V VX-1 V6J V6V W3Z */ "\\_SB.PCI0.P0P2.VGA.GETD", /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V S5A M5A z33A W1Jc W2V */ Loading Loading @@ -263,7 +262,8 @@ static int read_acpi_int(acpi_handle handle, const char *method, int *val, return (status == AE_OK) && (out_obj.type == ACPI_TYPE_INTEGER); } static int read_wireless_status(int mask) { static int read_wireless_status(int mask) { int status; if (!wireless_status_handle) Loading @@ -287,8 +287,7 @@ static int read_status(int mask) return (hotk->status & mask) ? 1 : 0; } static void write_status(acpi_handle handle, int out, int mask, int invert) static void write_status(acpi_handle handle, int out, int mask, int invert) { hotk->status = (out) ? (hotk->status | mask) : (hotk->status & ~mask); Loading Loading @@ -535,8 +534,9 @@ static ssize_t show_bluetooth(struct device *dev, return sprintf(buf, "%d\n", read_status(BT_ON)); } static ssize_t store_bluetooth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) static ssize_t store_bluetooth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { return store_status(buf, count, bt_switch_handle, BT_ON, 0); } Loading Loading @@ -567,6 +567,7 @@ static int read_display(void) return value; } /* * Now, *this* one could be more user-friendly, but so far, no-one has * complained. The significance of bits is the same as in store_disp() Loading Loading @@ -724,7 +725,6 @@ static struct platform_driver asuspf_driver = { static struct platform_device *asuspf_device; static void asus_hotk_add_fs(void) { ASUS_SET_DEVICE_ATTR(infos, 0444, show_infos, NULL); Loading Loading @@ -770,7 +770,6 @@ static int asus_handle_init(char *name, acpi_handle *handle, asus_handle_init(#object, &object##_handle, object##_paths, \ ARRAY_SIZE(object##_paths)) /* * This function is used to initialize the hotk with right values. In this * method, we can make all the detection we want, and modify the hotk struct Loading Loading @@ -1048,14 +1047,14 @@ static int asus_backlight_init(struct device * dev) } static int asus_led_register(acpi_handle handle, struct led_classdev * ldev, struct device * dev) struct led_classdev *ldev, struct device *dev) { if (!handle) return 0; return led_classdev_register(dev, ldev); } #define ASUS_LED_REGISTER(object, device) \ asus_led_register(object##_set_handle, &object##_led, device) Loading