浏览代码

intel-rst: Clean up ACPI add function

There is no need to initialize the error since it is going to be assigned
with the return status of at least on of the device_create_file() call.

We can return directly in case the first file creation fails.
All the labels for goto can be removed (along with the gotos) as well.
Tell the compiler that the failures are unlikely so it can create better
binaries.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Peter Ujfalusi 11 年之前
父节点
当前提交
a3d3c53f73
共有 1 个文件被更改,包括 5 次插入10 次删除
  1. 5 10
      drivers/platform/x86/intel-rst.c

+ 5 - 10
drivers/platform/x86/intel-rst.c

@@ -119,21 +119,16 @@ static struct device_attribute irst_timeout_attr = {
 
 
 static int irst_add(struct acpi_device *acpi)
 static int irst_add(struct acpi_device *acpi)
 {
 {
-	int error = 0;
+	int error;
 
 
 	error = device_create_file(&acpi->dev, &irst_timeout_attr);
 	error = device_create_file(&acpi->dev, &irst_timeout_attr);
-	if (error)
-		goto out;
+	if (unlikely(error))
+		return error;
 
 
 	error = device_create_file(&acpi->dev, &irst_wakeup_attr);
 	error = device_create_file(&acpi->dev, &irst_wakeup_attr);
-	if (error)
-		goto out_timeout;
+	if (unlikely(error))
+		device_remove_file(&acpi->dev, &irst_timeout_attr);
 
 
-	return 0;
-
-out_timeout:
-	device_remove_file(&acpi->dev, &irst_timeout_attr);
-out:
 	return error;
 	return error;
 }
 }