Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1707425

[PATCH v2 4/9] ACPI-video: Return directly after a failed input_allocate_device()

From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH v2 4/9] ACPI-video: Return directly after a failed input_allocate_device()
Date 2017-08-09 17:50 +0200
Message-ID <ucBp7-PO-7@gated-at.bofh.it> (permalink)
References (3 earlier) <seffb-4Kg-7@gated-at.bofh.it> <semJH-1kY-9@gated-at.bofh.it> <sepod-36Y-1@gated-at.bofh.it> <sevN0-7ef-19@gated-at.bofh.it> <ucBfr-Mz-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 9 Aug 2017 15:15:16 +0200

* Return directly after a call of the function "input_allocate_device"
  failed at the beginning.

* Delete the jump label "out" which became unnecessary with
  this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/acpi/acpi_video.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index f83ece9c830c..09ea1f115f55 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -1903,10 +1903,8 @@ static int acpi_video_bus_add_notify_handler(struct acpi_video_bus *video)
 	int error;
 
 	video->input = input = input_allocate_device();
-	if (!input) {
-		error = -ENOMEM;
-		goto out;
-	}
+	if (!input)
+		return -ENOMEM;
 
 	error = acpi_video_bus_start_devices(video);
 	if (error)
@@ -1946,7 +1944,6 @@ static int acpi_video_bus_add_notify_handler(struct acpi_video_bus *video)
 err_free_input:
 	input_free_device(input);
 	video->input = NULL;
-out:
 	return error;
 }
 
-- 
2.13.4

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v2 0/9] ACPI-video: Fine-tuning for several function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:40 +0200
  [PATCH v2 1/9] ACPI-video: Use kmalloc_array() in  acpi_video_get_levels() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:40 +0200
  [PATCH v2 3/9] ACPI-video: Delete an error message for a failed  kzalloc() call SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:40 +0200
  [PATCH v2 2/9] ACPI-video: Return directly after a failed device  query SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:40 +0200
  [PATCH v2 9/9] ACPI-video: Improve a size determination in four  functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:50 +0200
  [PATCH v2 8/9] ACPI-video: Move four assignments in  acpi_video_get_levels() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:50 +0200
  [PATCH v2 4/9] ACPI-video: Return directly after a failed  input_allocate_device() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:50 +0200
  [PATCH v2 6/9] ACPI-video: Improve a jump target in  acpi_video_switch_brightness() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:50 +0200
  [PATCH v2 7/9] ACPI-video: Delete an unnecessary initialisation in  three functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:50 +0200
  [PATCH v2 5/9] ACPI-video: Delete unnecessary if statement in  acpi_video_switch_brightness() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-09 17:50 +0200

csiph-web