Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c3442f5 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by David S. Miller
Browse files

drivers: net: replace UINT64_MAX with U64_MAX 



U64_MAX is well defined now while the UINT64_MAX is not, so we fall
back to drivers' own definition as below:

	#ifndef UINT64_MAX
	#define UINT64_MAX             (u64)(~((u64)0))
	#endif

I believe this is in one phy driver then copied and pasted to other phy
drivers.

Replace the UINT64_MAX with U64_MAX to clean up the source code.

Signed-off-by: default avatarJisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80e95f47

drivers/net/dsa/mv88e6xxx/chip.c

+3 −3
Original line number Diff line number Diff line
@@ -665,13 +665,13 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip, 
	case STATS_TYPE_PORT:

		err = mv88e6xxx_port_read(chip, port, s->reg, &reg);

		if (err)

			return UINT64_MAX;

			return U64_MAX;



		low = reg;

		if (s->size == 4) {

			err = mv88e6xxx_port_read(chip, port, s->reg + 1, &reg);

			if (err)

				return UINT64_MAX;

				return U64_MAX;

			high = reg;

		}

		break;
@@ -685,7 +685,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip, 
			mv88e6xxx_g1_stats_read(chip, reg + 1, &high);

		break;

	default:

		return UINT64_MAX;

		return U64_MAX;

	}

	value = (((u64)high) << 16) | low;

	return value;

drivers/net/dsa/mv88e6xxx/chip.h

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
#include <linux/timecounter.h>

#include <net/dsa.h>



#ifndef UINT64_MAX

#define UINT64_MAX		(u64)(~((u64)0))

#endif



#define SMI_CMD			0x00

#define SMI_CMD_BUSY		BIT(15)

#define SMI_CMD_CLAUSE_22	BIT(12)

drivers/net/phy/bcm-phy-lib.c

+1 −5
Original line number Diff line number Diff line
@@ -346,10 +346,6 @@ void bcm_phy_get_strings(struct phy_device *phydev, u8 *data) 
}

EXPORT_SYMBOL_GPL(bcm_phy_get_strings);



#ifndef UINT64_MAX

#define UINT64_MAX              (u64)(~((u64)0))

#endif



/* Caller is supposed to provide appropriate storage for the library code to

 * access the shadow copy

 */
@@ -362,7 +358,7 @@ static u64 bcm_phy_get_stat(struct phy_device *phydev, u64 *shadow, 


	val = phy_read(phydev, stat.reg);

	if (val < 0) {

		ret = UINT64_MAX;

		ret = U64_MAX;

	} else {

		val >>= stat.shift;

		val = val & ((1 << stat.bits) - 1);

drivers/net/phy/marvell.c

+1 −4
Original line number Diff line number Diff line
@@ -1482,9 +1482,6 @@ static void marvell_get_strings(struct phy_device *phydev, u8 *data) 
	}

}



#ifndef UINT64_MAX

#define UINT64_MAX		(u64)(~((u64)0))

#endif

static u64 marvell_get_stat(struct phy_device *phydev, int i)

{

	struct marvell_hw_stat stat = marvell_hw_stats[i];
@@ -1494,7 +1491,7 @@ static u64 marvell_get_stat(struct phy_device *phydev, int i) 


	val = phy_read_paged(phydev, stat.page, stat.reg);

	if (val < 0) {

		ret = UINT64_MAX;

		ret = U64_MAX;

	} else {

		val = val & ((1 << stat.bits) - 1);

		priv->stats[i] += val;

drivers/net/phy/micrel.c

+1 −4
Original line number Diff line number Diff line
@@ -650,9 +650,6 @@ static void kszphy_get_strings(struct phy_device *phydev, u8 *data) 
	}

}



#ifndef UINT64_MAX

#define UINT64_MAX              (u64)(~((u64)0))

#endif

static u64 kszphy_get_stat(struct phy_device *phydev, int i)

{

	struct kszphy_hw_stat stat = kszphy_hw_stats[i];
@@ -662,7 +659,7 @@ static u64 kszphy_get_stat(struct phy_device *phydev, int i) 


	val = phy_read(phydev, stat.reg);

	if (val < 0) {

		ret = UINT64_MAX;

		ret = U64_MAX;

	} else {

		val = val & ((1 << stat.bits) - 1);

		priv->stats[i] += val;