diff options
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 11 | ||||
-rw-r--r-- | drivers/platform/x86/acer-wmi.c | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 43f48098220d..c4a6e148732a 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -581,3 +581,14 @@ Why: This driver has been superseded by g_mass_storage. | |||
581 | Who: Alan Stern <stern@rowland.harvard.edu> | 581 | Who: Alan Stern <stern@rowland.harvard.edu> |
582 | 582 | ||
583 | ---------------------------- | 583 | ---------------------------- |
584 | |||
585 | What: threeg and interface sysfs files in /sys/devices/platform/acer-wmi | ||
586 | When: 2012 | ||
587 | Why: In 3.0, we can now autodetect internal 3G device and already have | ||
588 | the threeg rfkill device. So, we plan to remove threeg sysfs support | ||
589 | for it's no longer necessary. | ||
590 | |||
591 | We also plan to remove interface sysfs file that exposed which ACPI-WMI | ||
592 | interface that was used by acer-wmi driver. It will replaced by | ||
593 | information log when acer-wmi initial. | ||
594 | Who: Lee, Chun-Yi <jlee@novell.com> | ||
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index e1c4938b301b..089db868799e 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
@@ -1400,6 +1400,9 @@ static ssize_t show_bool_threeg(struct device *dev, | |||
1400 | { | 1400 | { |
1401 | u32 result; \ | 1401 | u32 result; \ |
1402 | acpi_status status; | 1402 | acpi_status status; |
1403 | |||
1404 | pr_info("This threeg sysfs will be removed in 2012" | ||
1405 | " - used by: %s\n", current->comm); | ||
1403 | if (wmi_has_guid(WMID_GUID3)) | 1406 | if (wmi_has_guid(WMID_GUID3)) |
1404 | status = wmid3_get_device_status(&result, | 1407 | status = wmid3_get_device_status(&result, |
1405 | ACER_WMID3_GDS_THREEG); | 1408 | ACER_WMID3_GDS_THREEG); |
@@ -1415,8 +1418,10 @@ static ssize_t set_bool_threeg(struct device *dev, | |||
1415 | { | 1418 | { |
1416 | u32 tmp = simple_strtoul(buf, NULL, 10); | 1419 | u32 tmp = simple_strtoul(buf, NULL, 10); |
1417 | acpi_status status = set_u32(tmp, ACER_CAP_THREEG); | 1420 | acpi_status status = set_u32(tmp, ACER_CAP_THREEG); |
1418 | if (ACPI_FAILURE(status)) | 1421 | pr_info("This threeg sysfs will be removed in 2012" |
1419 | return -EINVAL; | 1422 | " - used by: %s\n", current->comm); |
1423 | if (ACPI_FAILURE(status)) | ||
1424 | return -EINVAL; | ||
1420 | return count; | 1425 | return count; |
1421 | } | 1426 | } |
1422 | static DEVICE_ATTR(threeg, S_IRUGO | S_IWUSR, show_bool_threeg, | 1427 | static DEVICE_ATTR(threeg, S_IRUGO | S_IWUSR, show_bool_threeg, |
@@ -1425,6 +1430,8 @@ static DEVICE_ATTR(threeg, S_IRUGO | S_IWUSR, show_bool_threeg, | |||
1425 | static ssize_t show_interface(struct device *dev, struct device_attribute *attr, | 1430 | static ssize_t show_interface(struct device *dev, struct device_attribute *attr, |
1426 | char *buf) | 1431 | char *buf) |
1427 | { | 1432 | { |
1433 | pr_info("This interface sysfs will be removed in 2012" | ||
1434 | " - used by: %s\n", current->comm); | ||
1428 | switch (interface->type) { | 1435 | switch (interface->type) { |
1429 | case ACER_AMW0: | 1436 | case ACER_AMW0: |
1430 | return sprintf(buf, "AMW0\n"); | 1437 | return sprintf(buf, "AMW0\n"); |