Commit f21bcefc authored by Colin Ian King's avatar Colin Ian King Committed by Kalle Valo

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: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 454127ad
...@@ -470,7 +470,6 @@ static inline struct rcs __iomem *rcs_base(ray_dev_t *dev) ...@@ -470,7 +470,6 @@ static inline struct rcs __iomem *rcs_base(ray_dev_t *dev)
static int ray_init(struct net_device *dev) static int ray_init(struct net_device *dev)
{ {
int i; int i;
UCHAR *p;
struct ccs __iomem *pccs; struct ccs __iomem *pccs;
ray_dev_t *local = netdev_priv(dev); ray_dev_t *local = netdev_priv(dev);
struct pcmcia_device *link = local->finder; struct pcmcia_device *link = local->finder;
...@@ -513,12 +512,9 @@ static int ray_init(struct net_device *dev) ...@@ -513,12 +512,9 @@ static int ray_init(struct net_device *dev)
init_startup_params(local); init_startup_params(local);
/* copy mac address to startup parameters */ /* copy mac address to startup parameters */
if (parse_addr(phy_addr, local->sparm.b4.a_mac_addr)) { if (!parse_addr(phy_addr, local->sparm.b4.a_mac_addr)) {
p = local->sparm.b4.a_mac_addr;
} else {
memcpy(&local->sparm.b4.a_mac_addr, memcpy(&local->sparm.b4.a_mac_addr,
&local->startup_res.station_addr, ADDRLEN); &local->startup_res.station_addr, ADDRLEN);
p = local->sparm.b4.a_mac_addr;
} }
clear_interrupt(local); /* Clear any interrupt from the card */ clear_interrupt(local); /* Clear any interrupt from the card */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment