mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
stmmac: dwmac-ipq806x: fix static checker warning
The patch b1c17215d7
: "stmmac: add ipq806x glue layer", leads to the
following static checker warning:
.../stmmac/dwmac-ipq806x.c:314 ipq806x_gmac_probe()
warn: double left shift '1 << (1 << gmac->id)'
The NSS_COMMON_CLK_SRC_CTRL_OFFSET macro is used once as an offset, and
once as a mask, which is a bug indeed. We'll fix it by defining the
offset as the real offset value and computing the mask from it when
required.
Tested on IPQ806x ref designs AP148 & DB149.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
866b8b18e3
commit
4f7eb70f7b
1 changed files with 2 additions and 2 deletions
|
@ -42,7 +42,7 @@
|
|||
#define NSS_COMMON_CLK_DIV_MASK 0x7f
|
||||
|
||||
#define NSS_COMMON_CLK_SRC_CTRL 0x14
|
||||
#define NSS_COMMON_CLK_SRC_CTRL_OFFSET(x) (1 << x)
|
||||
#define NSS_COMMON_CLK_SRC_CTRL_OFFSET(x) (x)
|
||||
/* Mode is coded on 1 bit but is different depending on the MAC ID:
|
||||
* MAC0: QSGMII=0 RGMII=1
|
||||
* MAC1: QSGMII=0 SGMII=0 RGMII=1
|
||||
|
@ -291,7 +291,7 @@ static void *ipq806x_gmac_setup(struct platform_device *pdev)
|
|||
|
||||
/* Configure the clock src according to the mode */
|
||||
regmap_read(gmac->nss_common, NSS_COMMON_CLK_SRC_CTRL, &val);
|
||||
val &= ~NSS_COMMON_CLK_SRC_CTRL_OFFSET(gmac->id);
|
||||
val &= ~(1 << NSS_COMMON_CLK_SRC_CTRL_OFFSET(gmac->id));
|
||||
switch (gmac->phy_mode) {
|
||||
case PHY_INTERFACE_MODE_RGMII:
|
||||
val |= NSS_COMMON_CLK_SRC_CTRL_RGMII(gmac->id) <<
|
||||
|
|
Loading…
Reference in a new issue