Skip to content

Commit

Permalink
net-next: stmmac: Convert old_link to bool
Browse files Browse the repository at this point in the history
This patch convert old_link from int to bool since it store only 1 or 0

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
LABBE Corentin authored and David S. Miller committed May 25, 2017
1 parent afbe17a commit 4d869b0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/stmicro/stmmac/stmmac.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ struct stmmac_priv {
/* TX Queue */
struct stmmac_tx_queue tx_queue[MTL_MAX_TX_QUEUES];

int oldlink;
bool oldlink;
int speed;
int oldduplex;
unsigned int flow_ctrl;
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -840,11 +840,11 @@ static void stmmac_adjust_link(struct net_device *dev)

if (!priv->oldlink) {
new_state = true;
priv->oldlink = 1;
priv->oldlink = true;
}
} else if (priv->oldlink) {
new_state = true;
priv->oldlink = 0;
priv->oldlink = false;
priv->speed = SPEED_UNKNOWN;
priv->oldduplex = DUPLEX_UNKNOWN;
}
Expand Down Expand Up @@ -907,7 +907,7 @@ static int stmmac_init_phy(struct net_device *dev)
char bus_id[MII_BUS_ID_SIZE];
int interface = priv->plat->interface;
int max_speed = priv->plat->max_speed;
priv->oldlink = 0;
priv->oldlink = false;
priv->speed = SPEED_UNKNOWN;
priv->oldduplex = DUPLEX_UNKNOWN;

Expand Down Expand Up @@ -4291,7 +4291,7 @@ int stmmac_suspend(struct device *dev)
}
spin_unlock_irqrestore(&priv->lock, flags);

priv->oldlink = 0;
priv->oldlink = false;
priv->speed = SPEED_UNKNOWN;
priv->oldduplex = DUPLEX_UNKNOWN;
return 0;
Expand Down

0 comments on commit 4d869b0

Please sign in to comment.