Commit 855b8bc9 authored by Mattia Dongili's avatar Mattia Dongili Committed by Matthew Garrett

sony-laptop: only show the handles sysfs file in debug mode

It makes no sense to expose this type of information to userspace unless
the driver was explicitly loaded with the debug option.
Signed-off-by: default avatarMattia Dongili <malattia@linux.it>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 8713b04a
...@@ -771,11 +771,6 @@ static int sony_nc_handles_setup(struct platform_device *pd) ...@@ -771,11 +771,6 @@ static int sony_nc_handles_setup(struct platform_device *pd)
if (!handles) if (!handles)
return -ENOMEM; return -ENOMEM;
sysfs_attr_init(&handles->devattr.attr);
handles->devattr.attr.name = "handles";
handles->devattr.attr.mode = S_IRUGO;
handles->devattr.show = sony_nc_handles_show;
for (i = 0; i < ARRAY_SIZE(handles->cap); i++) { for (i = 0; i < ARRAY_SIZE(handles->cap); i++) {
if (!acpi_callsetfunc(sony_nc_acpi_handle, if (!acpi_callsetfunc(sony_nc_acpi_handle,
"SN00", i + 0x20, &result)) { "SN00", i + 0x20, &result)) {
...@@ -785,11 +780,18 @@ static int sony_nc_handles_setup(struct platform_device *pd) ...@@ -785,11 +780,18 @@ static int sony_nc_handles_setup(struct platform_device *pd)
} }
} }
/* allow reading capabilities via sysfs */ if (debug) {
if (device_create_file(&pd->dev, &handles->devattr)) { sysfs_attr_init(&handles->devattr.attr);
kfree(handles); handles->devattr.attr.name = "handles";
handles = NULL; handles->devattr.attr.mode = S_IRUGO;
return -1; handles->devattr.show = sony_nc_handles_show;
/* allow reading capabilities via sysfs */
if (device_create_file(&pd->dev, &handles->devattr)) {
kfree(handles);
handles = NULL;
return -1;
}
} }
return 0; return 0;
...@@ -798,7 +800,8 @@ static int sony_nc_handles_setup(struct platform_device *pd) ...@@ -798,7 +800,8 @@ static int sony_nc_handles_setup(struct platform_device *pd)
static int sony_nc_handles_cleanup(struct platform_device *pd) static int sony_nc_handles_cleanup(struct platform_device *pd)
{ {
if (handles) { if (handles) {
device_remove_file(&pd->dev, &handles->devattr); if (debug)
device_remove_file(&pd->dev, &handles->devattr);
kfree(handles); kfree(handles);
handles = NULL; handles = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment