From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:37027 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752834AbdCFJKt (ORCPT ); Mon, 6 Mar 2017 04:10:49 -0500 From: Jiri Slaby To: stable@vger.kernel.org Cc: Jingoo Han , Bjorn Helgaas , Jiri Slaby Subject: [patch added to 3.12-stable] PCI: mvebu: Use max_t() instead of max(resource_size_t,) Date: Mon, 6 Mar 2017 10:09:29 +0100 Message-Id: <20170306090936.30522-17-jslaby@suse.cz> In-Reply-To: <20170306090936.30522-1-jslaby@suse.cz> References: <20170306090936.30522-1-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org List-ID: From: Jingoo Han This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== 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 Signed-off-by: Bjorn Helgaas Acked-by: Jason Cooper Signed-off-by: Jiri Slaby --- drivers/pci/host/pci-mvebu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 1324c3b93ee5..9b00bcebc2a3 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -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; } -- 2.12.0