]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: mdio: mux-bcm-iproc: Use alignment helpers and SZ_4K
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fri, 29 Dec 2023 14:52:32 +0000 (16:52 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 4 Jan 2024 00:40:59 +0000 (16:40 -0800)
Instead of open coding, use IS_ALIGNED() and ALIGN_DOWN() when dealing
with alignment. Replace also literals with SZ_4K.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Acked-by: Ray Jui <ray.jui@broadcom.com>
Link: https://lore.kernel.org/r/20231229145232.6163-1-ilpo.jarvinen@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/mdio/mdio-mux-bcm-iproc.c

index a750bd4c77a033f03e5abf31d4bf527617e6d3ea..1ce7d67ba72ef2c4654f2811c6bf700621910cb2 100644 (file)
@@ -2,6 +2,7 @@
 /*
  * Copyright 2016 Broadcom
  */
+#include <linux/align.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/device.h>
@@ -11,6 +12,7 @@
 #include <linux/of_mdio.h>
 #include <linux/phy.h>
 #include <linux/platform_device.h>
+#include <linux/sizes.h>
 
 #define MDIO_RATE_ADJ_EXT_OFFSET       0x000
 #define MDIO_RATE_ADJ_INT_OFFSET       0x004
@@ -220,12 +222,12 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
        md->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
        if (IS_ERR(md->base))
                return PTR_ERR(md->base);
-       if (res->start & 0xfff) {
+       if (!IS_ALIGNED(res->start, SZ_4K)) {
                /* For backward compatibility in case the
                 * base address is specified with an offset.
                 */
                dev_info(&pdev->dev, "fix base address in dt-blob\n");
-               res->start &= ~0xfff;
+               res->start = ALIGN_DOWN(res->start, SZ_4K);
                res->end = res->start + MDIO_REG_ADDR_SPACE_SIZE - 1;
        }