On Fri, Dec 27, 2013 at 09:34:36AM +0900, Jingoo Han wrote: > 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@xxxxxxxxxxx> Applied with Jason's ack to pci/host-mvebu for v3.14, thanks! Bjorn > --- > 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 bedc0b1..fa140e1 100644 > --- a/drivers/pci/host/pci-mvebu.c > +++ b/drivers/pci/host/pci-mvebu.c > @@ -735,9 +735,9 @@ static 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; > } > -- > 1.7.10.4 > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html