diff mbox

sound: firewire: fireworks: fireworks_command: Remove unused function

Message ID 1420908780-31468-1-git-send-email-rickard_strandqvist@spectrumdigital.se (mailing list archive)
State New, archived
Headers show

Commit Message

Rickard Strandqvist Jan. 10, 2015, 4:53 p.m. UTC
Remove the function snd_efw_command_set_resp_addr() that is not used anywhere.

This was partially found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
 sound/firewire/fireworks/fireworks.h         |    2 --
 sound/firewire/fireworks/fireworks_command.c |   21 ---------------------
 2 files changed, 23 deletions(-)

Comments

Takashi Iwai Jan. 11, 2015, 4:05 p.m. UTC | #1
At Sat, 10 Jan 2015 17:53:00 +0100,
Rickard Strandqvist wrote:
> 
> Remove the function snd_efw_command_set_resp_addr() that is not used anywhere.
> 
> This was partially found by using a static code analysis program called cppcheck.
> 
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>

I leave the decision to Sakamoto-san and Clemens.  Let me know if this
should be applied or not.


thanks,

Takashi

> ---
>  sound/firewire/fireworks/fireworks.h         |    2 --
>  sound/firewire/fireworks/fireworks_command.c |   21 ---------------------
>  2 files changed, 23 deletions(-)
> 
> diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h
> index 4f0201a..693b76b 100644
> --- a/sound/firewire/fireworks/fireworks.h
> +++ b/sound/firewire/fireworks/fireworks.h
> @@ -189,8 +189,6 @@ enum snd_efw_transport_mode {
>  	SND_EFW_TRANSPORT_MODE_WINDOWS	= 0,
>  	SND_EFW_TRANSPORT_MODE_IEC61883	= 1,
>  };
> -int snd_efw_command_set_resp_addr(struct snd_efw *efw,
> -				  u16 addr_high, u32 addr_low);
>  int snd_efw_command_set_tx_mode(struct snd_efw *efw,
>  				enum snd_efw_transport_mode mode);
>  int snd_efw_command_get_hwinfo(struct snd_efw *efw,
> diff --git a/sound/firewire/fireworks/fireworks_command.c b/sound/firewire/fireworks/fireworks_command.c
> index 166f805..e0cc467 100644
> --- a/sound/firewire/fireworks/fireworks_command.c
> +++ b/sound/firewire/fireworks/fireworks_command.c
> @@ -175,27 +175,6 @@ end:
>  }
>  
>  /*
> - * The address in host system for transaction response is changable when the
> - * device supports. struct hwinfo.flags includes its flag. The default is
> - * MEMORY_SPACE_EFW_RESPONSE.
> - */
> -int snd_efw_command_set_resp_addr(struct snd_efw *efw,
> -				  u16 addr_high, u32 addr_low)
> -{
> -	__be32 addr[2];
> -
> -	addr[0] = cpu_to_be32(addr_high);
> -	addr[1] = cpu_to_be32(addr_low);
> -
> -	if (!efw->resp_addr_changable)
> -		return -ENOSYS;
> -
> -	return efw_transaction(efw, EFC_CAT_HWCTL,
> -			       EFC_CMD_HWINFO_SET_RESP_ADDR,
> -			       addr, sizeof(addr), NULL, 0);
> -}
> -
> -/*
>   * This is for timestamp processing. In Windows mode, all 32bit fields of second
>   * CIP header in AMDTP transmit packet is used for 'presentation timestamp'. In
>   * 'no data' packet the value of this field is 0x90ffffff.
> -- 
> 1.7.10.4
>
Takashi Sakamoto Jan. 13, 2015, 12:23 a.m. UTC | #2
Hi,

On Jan 12 2014 01:05, Takashi Iwai wrote:
> At Sat, 10 Jan 2015 17:53:00 +0100,
> Rickard Strandqvist wrote:
>>
>> Remove the function snd_efw_command_set_resp_addr() that is not used anywhere.
>>
>> This was partially found by using a static code analysis program called cppcheck.
>>
>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> 
> I leave the decision to Sakamoto-san and Clemens.  Let me know if this
> should be applied or not.
> 
> 
> thanks,
> 
> Takashi

When removing this function, struct snd_efw.resp_addr_changable and
FLAG_RESP_ADDR_CHANGABLE, codes in get_hardware_info() can be also removed.

Originally, I planned to set expected response address at probing this
driver because I have no convinience about the initial value. On the
other hand, checking the flags needs a successful transaction. This is
like a story about 'chicken or the egg'. So I cannot achieve this.

Now that I have no reports about disorder in this point (this driver
cannot handle any Fireworks devices), this function has just a meaning
of FYI.


Regards

Takashi Sakamoto

>> ---
>>  sound/firewire/fireworks/fireworks.h         |    2 --
>>  sound/firewire/fireworks/fireworks_command.c |   21 ---------------------
>>  2 files changed, 23 deletions(-)
>>
>> diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h
>> index 4f0201a..693b76b 100644
>> --- a/sound/firewire/fireworks/fireworks.h
>> +++ b/sound/firewire/fireworks/fireworks.h
>> @@ -189,8 +189,6 @@ enum snd_efw_transport_mode {
>>  	SND_EFW_TRANSPORT_MODE_WINDOWS	= 0,
>>  	SND_EFW_TRANSPORT_MODE_IEC61883	= 1,
>>  };
>> -int snd_efw_command_set_resp_addr(struct snd_efw *efw,
>> -				  u16 addr_high, u32 addr_low);
>>  int snd_efw_command_set_tx_mode(struct snd_efw *efw,
>>  				enum snd_efw_transport_mode mode);
>>  int snd_efw_command_get_hwinfo(struct snd_efw *efw,
>> diff --git a/sound/firewire/fireworks/fireworks_command.c b/sound/firewire/fireworks/fireworks_command.c
>> index 166f805..e0cc467 100644
>> --- a/sound/firewire/fireworks/fireworks_command.c
>> +++ b/sound/firewire/fireworks/fireworks_command.c
>> @@ -175,27 +175,6 @@ end:
>>  }
>>  
>>  /*
>> - * The address in host system for transaction response is changable when the
>> - * device supports. struct hwinfo.flags includes its flag. The default is
>> - * MEMORY_SPACE_EFW_RESPONSE.
>> - */
>> -int snd_efw_command_set_resp_addr(struct snd_efw *efw,
>> -				  u16 addr_high, u32 addr_low)
>> -{
>> -	__be32 addr[2];
>> -
>> -	addr[0] = cpu_to_be32(addr_high);
>> -	addr[1] = cpu_to_be32(addr_low);
>> -
>> -	if (!efw->resp_addr_changable)
>> -		return -ENOSYS;
>> -
>> -	return efw_transaction(efw, EFC_CAT_HWCTL,
>> -			       EFC_CMD_HWINFO_SET_RESP_ADDR,
>> -			       addr, sizeof(addr), NULL, 0);
>> -}
>> -
>> -/*
>>   * This is for timestamp processing. In Windows mode, all 32bit fields of second
>>   * CIP header in AMDTP transmit packet is used for 'presentation timestamp'. In
>>   * 'no data' packet the value of this field is 0x90ffffff.
>> -- 
>> 1.7.10.4
diff mbox

Patch

diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h
index 4f0201a..693b76b 100644
--- a/sound/firewire/fireworks/fireworks.h
+++ b/sound/firewire/fireworks/fireworks.h
@@ -189,8 +189,6 @@  enum snd_efw_transport_mode {
 	SND_EFW_TRANSPORT_MODE_WINDOWS	= 0,
 	SND_EFW_TRANSPORT_MODE_IEC61883	= 1,
 };
-int snd_efw_command_set_resp_addr(struct snd_efw *efw,
-				  u16 addr_high, u32 addr_low);
 int snd_efw_command_set_tx_mode(struct snd_efw *efw,
 				enum snd_efw_transport_mode mode);
 int snd_efw_command_get_hwinfo(struct snd_efw *efw,
diff --git a/sound/firewire/fireworks/fireworks_command.c b/sound/firewire/fireworks/fireworks_command.c
index 166f805..e0cc467 100644
--- a/sound/firewire/fireworks/fireworks_command.c
+++ b/sound/firewire/fireworks/fireworks_command.c
@@ -175,27 +175,6 @@  end:
 }
 
 /*
- * The address in host system for transaction response is changable when the
- * device supports. struct hwinfo.flags includes its flag. The default is
- * MEMORY_SPACE_EFW_RESPONSE.
- */
-int snd_efw_command_set_resp_addr(struct snd_efw *efw,
-				  u16 addr_high, u32 addr_low)
-{
-	__be32 addr[2];
-
-	addr[0] = cpu_to_be32(addr_high);
-	addr[1] = cpu_to_be32(addr_low);
-
-	if (!efw->resp_addr_changable)
-		return -ENOSYS;
-
-	return efw_transaction(efw, EFC_CAT_HWCTL,
-			       EFC_CMD_HWINFO_SET_RESP_ADDR,
-			       addr, sizeof(addr), NULL, 0);
-}
-
-/*
  * This is for timestamp processing. In Windows mode, all 32bit fields of second
  * CIP header in AMDTP transmit packet is used for 'presentation timestamp'. In
  * 'no data' packet the value of this field is 0x90ffffff.