Skip to contentSkip to conversation

ALSA: fireworks: remove some stray checks

PATCH Applied Dan Carpenter 3 participants 3 messages May 28, 2014 – May 29, 2014

Subsystems (3)
Sound Kernel janitors Firewire audio drivers and IEC 61883-1/6 packet streaming engine
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/2 ALSA: fireworks: remove some stray checks

We checked "err" earlier. These things seem to be left over code.

Signed-off-by Dan Carpenter <[email protected]>
sound/firewire/fireworks/fireworks.c +0 -4
index a354d26..8e856cc 100644
@@ -89,8 +89,6 @@ get_hardware_info(struct snd_efw *efw)
 	snprintf(version, sizeof(version), "%u.%u",
 		 (hwinfo->arm_version >> 24) & 0xff,
 		 (hwinfo->arm_version >> 16) & 0xff);
-	if (err < 0)
-		goto end;
 	efw->firmware_version = hwinfo->arm_version;
 
 	strcpy(efw->card->driver, "Fireworks");

@@ -101,8 +99,6 @@ get_hardware_info(struct snd_efw *efw)
 		 hwinfo->vendor_name, hwinfo->model_name, version,
 		 hwinfo->guid_hi, hwinfo->guid_lo,
 		 dev_name(&efw->unit->device), 100 << fw_dev->max_speed);
-	if (err < 0)
-		goto end;
 
 	if (hwinfo->flags & BIT(FLAG_RESP_ADDR_CHANGABLE))
 		efw->resp_addr_changable = true;
maintainer Tested-by on v1 1/2
#1 lore raw
Quoted 3 lines · Dan Carpenter

We checked "err" earlier. These things seem to be left over code.

Signed-off-by Dan Carpenter <[email protected]>
Reviewd-by Takashi Sakamoto <[email protected]>
Tested-by Takashi Sakamoto <[email protected]>
Quoted 22 lines
sound/firewire/fireworks/fireworks.c +0 -4
index a354d26..8e856cc 100644
@@ -89,8 +89,6 @@ get_hardware_info(struct snd_efw *efw)
 	snprintf(version, sizeof(version), "%u.%u",
 		 (hwinfo->arm_version >> 24) & 0xff,
 		 (hwinfo->arm_version >> 16) & 0xff);
-	if (err < 0)
-		goto end;
 	efw->firmware_version = hwinfo->arm_version;
 
 	strcpy(efw->card->driver, "Fireworks");

@@ -101,8 +99,6 @@ get_hardware_info(struct snd_efw *efw)
 		 hwinfo->vendor_name, hwinfo->model_name, version,
 		 hwinfo->guid_hi, hwinfo->guid_lo,
 		 dev_name(&efw->unit->device), 100 << fw_dev->max_speed);
-	if (err < 0)
-		goto end;
 
 	if (hwinfo->flags & BIT(FLAG_RESP_ADDR_CHANGABLE))
 		efw->resp_addr_changable = true;
Applied
#2 lore raw
In reply to Dan Carpenter

At Wed, 28 May 2014 19:42:02 +0300,

Quoted 4 lines · Dan Carpenter

We checked "err" earlier. These things seem to be left over code.

Signed-off-by Dan Carpenter <[email protected]>

Applied, thanks.

Takashi

Quoted 24 lines
sound/firewire/fireworks/fireworks.c +0 -4
index a354d26..8e856cc 100644
@@ -89,8 +89,6 @@ get_hardware_info(struct snd_efw *efw)
 	snprintf(version, sizeof(version), "%u.%u",
 		 (hwinfo->arm_version >> 24) & 0xff,
 		 (hwinfo->arm_version >> 16) & 0xff);
-	if (err < 0)
-		goto end;
 	efw->firmware_version = hwinfo->arm_version;
 
 	strcpy(efw->card->driver, "Fireworks");

@@ -101,8 +99,6 @@ get_hardware_info(struct snd_efw *efw)
 		 hwinfo->vendor_name, hwinfo->model_name, version,
 		 hwinfo->guid_hi, hwinfo->guid_lo,
 		 dev_name(&efw->unit->device), 100 << fw_dev->max_speed);
-	if (err < 0)
-		goto end;
 
 	if (hwinfo->flags & BIT(FLAG_RESP_ADDR_CHANGABLE))
 		efw->resp_addr_changable = true;