Message ID | 20220329200845.13435-3-kabel@kernel.org |
---|---|
State | Superseded |
Delegated to: | Ramon Fried |
Headers | show |
Series | u-boot-net refactors, fixes, cleanups | expand |
On Tue, Mar 29, 2022 at 10:08:33PM +0200, Marek Behún wrote: > From: Marek Behún <marek.behun@nic.cz> > > Use the ARRAY_SIZE() macro instead of hardcoding sizes of arrays in > macros. > > Signed-off-by: Marek Behún <marek.behun@nic.cz> > --- Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > net/mdio-uclass.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c > index 5735afe49e..649dc60f73 100644 > --- a/net/mdio-uclass.c > +++ b/net/mdio-uclass.c > @@ -16,13 +16,12 @@ > #include <linux/compat.h> > > /* DT node properties for MAC-PHY interface */ > -#define PHY_MODE_STR_CNT 2 > -static const char * const phy_mode_str[PHY_MODE_STR_CNT] = { > +static const char * const phy_mode_str[] = { > "phy-mode", "phy-connection-type" > }; > + > /* DT node properties that reference a PHY node */ > -#define PHY_HANDLE_STR_CNT 3 > -static const char * const phy_handle_str[PHY_HANDLE_STR_CNT] = { > +static const char * const phy_handle_str[] = { > "phy-handle", "phy", "phy-device" > }; > > @@ -149,7 +148,7 @@ static struct phy_device *dm_eth_connect_phy_handle(struct udevice *ethdev, > goto out; > } > > - for (i = 0; i < PHY_HANDLE_STR_CNT; i++) > + for (i = 0; i < ARRAY_SIZE(phy_handle_str); i++) > if (!dev_read_phandle_with_args(ethdev, phy_handle_str[i], NULL, > 0, 0, &phandle)) > break; > @@ -199,7 +198,7 @@ struct phy_device *dm_eth_phy_connect(struct udevice *ethdev) > } > > interface = PHY_INTERFACE_MODE_NONE; > - for (i = 0; i < PHY_MODE_STR_CNT; i++) { > + for (i = 0; i < ARRAY_SIZE(phy_mode_str); i++) { > if_str = dev_read_string(ethdev, phy_mode_str[i]); > if (if_str) { > interface = phy_get_interface_by_name(if_str); > -- > 2.34.1 >
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index 5735afe49e..649dc60f73 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -16,13 +16,12 @@ #include <linux/compat.h> /* DT node properties for MAC-PHY interface */ -#define PHY_MODE_STR_CNT 2 -static const char * const phy_mode_str[PHY_MODE_STR_CNT] = { +static const char * const phy_mode_str[] = { "phy-mode", "phy-connection-type" }; + /* DT node properties that reference a PHY node */ -#define PHY_HANDLE_STR_CNT 3 -static const char * const phy_handle_str[PHY_HANDLE_STR_CNT] = { +static const char * const phy_handle_str[] = { "phy-handle", "phy", "phy-device" }; @@ -149,7 +148,7 @@ static struct phy_device *dm_eth_connect_phy_handle(struct udevice *ethdev, goto out; } - for (i = 0; i < PHY_HANDLE_STR_CNT; i++) + for (i = 0; i < ARRAY_SIZE(phy_handle_str); i++) if (!dev_read_phandle_with_args(ethdev, phy_handle_str[i], NULL, 0, 0, &phandle)) break; @@ -199,7 +198,7 @@ struct phy_device *dm_eth_phy_connect(struct udevice *ethdev) } interface = PHY_INTERFACE_MODE_NONE; - for (i = 0; i < PHY_MODE_STR_CNT; i++) { + for (i = 0; i < ARRAY_SIZE(phy_mode_str); i++) { if_str = dev_read_string(ethdev, phy_mode_str[i]); if (if_str) { interface = phy_get_interface_by_name(if_str);