On Sun, Feb 15, 2009 at 3:14 PM, walter harms <wharms@xxxxxx> wrote:
> Hannes Eder schrieb:
>> Impact: Move variable declaration as close to usage as possible.
>>
>> Fix this sparse warning:
>> drivers/net/cxgb3/cxgb3_main.c:1586:21: warning: symbol 'cap' shadows an earlier one
>>
>> Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
>> ---
>> drivers/net/cxgb3/cxgb3_main.c | 3 +--
>> 1 files changed, 1 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
>> index f2c7cc3..0f6062a 100644
>> --- a/drivers/net/cxgb3/cxgb3_main.c
>> +++ b/drivers/net/cxgb3/cxgb3_main.c
>> @@ -1565,7 +1565,6 @@ static int speed_duplex_to_caps(int speed, int duplex)
>>
>> static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
>> {
>> - int cap;
>> struct port_info *p = netdev_priv(dev);
>> struct link_config *lc = &p->link_config;
>>
>> @@ -1575,7 +1574,7 @@ static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
>> * being requested.
>> */
>> if (cmd->autoneg == AUTONEG_DISABLE) {
>> - cap = speed_duplex_to_caps(cmd->speed, cmd->duplex);
>> + int cap = speed_duplex_to_caps(cmd->speed, cmd->duplex);
>> if (lc->supported & cap)
>> return 0;
>> }
>>
>
> Hello Hannes,
> it seems that "cap" can be dropped completely.
>
> if (lc->supported & speed_duplex_to_caps(cmd->speed, cmd->duplex) )
> return 0;
Hi Walter,
You are right, but we would hit the 80 characters per line limit,
90 in this case, and a similar construct is used a few lines
below so I suggest to leave it this way.
-Hannes
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
