ray_cs: remove redundant pointer 'p'

Pointer 'p' is being assigned but is never used hence it is
redundant and can be removed. Also re-work if statement to remove
redundant assignment of p.

Cleans up clang warning:
warning: variable 'p' set but not used [-Wunused-but-set-variable]

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index a7e0a17..08c607c 100644 (file)
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -470,7 +470,6 @@ static inline struct rcs __iomem *rcs_base(ray_dev_t *dev)
 static int ray_init(struct net_device *dev)
 {
        int i;
-       UCHAR *p;
        struct ccs __iomem *pccs;
        ray_dev_t *local = netdev_priv(dev);
        struct pcmcia_device *link = local->finder;
@@ -513,12 +512,9 @@ static int ray_init(struct net_device *dev)
        init_startup_params(local);
 
        /* copy mac address to startup parameters */
-       if (parse_addr(phy_addr, local->sparm.b4.a_mac_addr)) {
-               p = local->sparm.b4.a_mac_addr;
-       } else {
+       if (!parse_addr(phy_addr, local->sparm.b4.a_mac_addr)) {
                memcpy(&local->sparm.b4.a_mac_addr,
                       &local->startup_res.station_addr, ADDRLEN);
-               p = local->sparm.b4.a_mac_addr;
        }
 
        clear_interrupt(local); /* Clear any interrupt from the card */