Re: [PATCH] staging: slicoss: remove unused variables

[David Matlack]

On Fri, Sep 4, 2015 at 6:23 AM, Sudip Mukherjee
<sudipm.mukherjee@xxxxxxxxx> wrote:
> These variables were only assigned some values but they were never used.
>
> Signed-off-by: Sudip Mukherjee <sudip@xxxxxxxxxxxxxxx>
> ---
>  drivers/staging/slicoss/slicoss.c | 27 ++++++---------------------
>  1 file changed, 6 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
> index 8585970..1536ca0 100644
> --- a/drivers/staging/slicoss/slicoss.c
> +++ b/drivers/staging/slicoss/slicoss.c
> @@ -199,10 +199,8 @@ static void slic_mcast_set_mask(struct adapter *adapter)
>  static void slic_timer_ping(ulong dev)
>  {
>         struct adapter *adapter;
> -       struct sliccard *card;
>
>         adapter = netdev_priv((struct net_device *)dev);
> -       card = adapter->card;
>
>         adapter->pingtimer.expires = jiffies + (PING_TIMER_INTERVAL * HZ);
>         add_timer(&adapter->pingtimer);
> @@ -1719,7 +1717,6 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
>   */
>  static void slic_link_event_handler(struct adapter *adapter)
>  {
> -       int status;
>         struct slic_shmem *pshmem;
>
>         if (adapter->state != ADAPT_UP) {
> @@ -1730,15 +1727,13 @@ static void slic_link_event_handler(struct adapter *adapter)
>         pshmem = (struct slic_shmem *)(unsigned long)adapter->phys_shmem;
>
>  #if BITS_PER_LONG == 64
> -       status = slic_upr_request(adapter,
> -                                 SLIC_UPR_RLSR,
> -                                 SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
> -                                 SLIC_GET_ADDR_HIGH(&pshmem->linkstatus),
> -                                 0, 0);
> +       slic_upr_request(adapter, SLIC_UPR_RLSR,
> +                        SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
> +                        SLIC_GET_ADDR_HIGH(&pshmem->linkstatus), 0, 0);
>  #else
> -       status = slic_upr_request(adapter, SLIC_UPR_RLSR,
> -               (u32) &pshmem->linkstatus,      /* no 4GB wrap guaranteed */
> -                                 0, 0, 0);
> +       slic_upr_request(adapter, SLIC_UPR_RLSR,
> +                        (u32)&pshmem->linkstatus, /* no 4GB wrap guaranteed */
> +                        0, 0, 0);

Is status safe to ignore?

>  #endif
>  }
>
> @@ -2078,8 +2073,6 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
>                         adapter->error_interrupts++;
>                         if (isr & ISR_RMISS) {
>                                 int count;
> -                               int pre_count;
> -                               int errors;
>
>                                 struct slic_rcvqueue *rcvq =
>                                         &adapter->rcvqueue;
> @@ -2088,8 +2081,6 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
>
>                                 if (!rcvq->errors)
>                                         rcv_count = rcvq->count;
> -                               pre_count = rcvq->count;
> -                               errors = rcvq->errors;
>
>                                 while (rcvq->count < SLIC_RCVQ_FILLTHRESH) {
>                                         count = slic_rcvqueue_fill(adapter);
> @@ -2650,9 +2641,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
>         ushort calc_chksum;
>         struct slic_config_mac *pmac;
>         unsigned char fruformat;
> -       unsigned char oemfruformat;
>         struct atk_fru *patkfru;
> -       union oemfru *poemfru;
>         unsigned long flags;
>
>         /* Reset everything except PCI configuration space */
> @@ -2742,8 +2731,6 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
>                         pmac = pOeeprom->MacInfo;
>                         fruformat = pOeeprom->FruFormat;
>                         patkfru = &pOeeprom->AtkFru;
> -                       oemfruformat = pOeeprom->OemFruFormat;
> -                       poemfru = &pOeeprom->OemFru;
>                         macaddrs = 2;
>                         /* Minor kludge for Oasis card
>                              get 2 MAC addresses from the
> @@ -2757,8 +2744,6 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
>                         pmac = peeprom->u2.mac.MacInfo;
>                         fruformat = peeprom->FruFormat;
>                         patkfru = &peeprom->AtkFru;
> -                       oemfruformat = peeprom->OemFruFormat;
> -                       poemfru = &peeprom->OemFru;
>                         break;
>                 }
>
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/