]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI: mvebu: Use max_t() instead of max(resource_size_t,)
authorJingoo Han <jg1.han@samsung.com>
Fri, 27 Dec 2013 00:34:36 +0000 (09:34 +0900)
committerJiri Slaby <jslaby@suse.cz>
Fri, 3 Mar 2017 10:44:50 +0000 (11:44 +0100)
commit 06489002a175680e18b4c0dd0beb6aff2a6d3781 upstream.

Use max_t() instead of max(resource_size_t,) in order to fix
the following checkpatch warning.

  WARNING: max() should probably be max_t(resource_size_t, SZ_64K, size)
  WARNING: max() should probably be max_t(resource_size_t, SZ_1M, size)

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/pci/host/pci-mvebu.c

index 1324c3b93ee5320eb974d3d5605e8993711909ad..9b00bcebc2a3a436077de86dc8336d47f3a3c1bd 100644 (file)
@@ -682,9 +682,9 @@ resource_size_t mvebu_pcie_align_resource(struct pci_dev *dev,
         * aligned on their size
         */
        if (res->flags & IORESOURCE_IO)
-               return round_up(start, max((resource_size_t)SZ_64K, size));
+               return round_up(start, max_t(resource_size_t, SZ_64K, size));
        else if (res->flags & IORESOURCE_MEM)
-               return round_up(start, max((resource_size_t)SZ_1M, size));
+               return round_up(start, max_t(resource_size_t, SZ_1M, size));
        else
                return start;
 }