From patchwork Tue Mar 11 17:43:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3813591 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C5B2FBF540 for ; Tue, 11 Mar 2014 17:44:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDF4520219 for ; Tue, 11 Mar 2014 17:44:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 184D8201F0 for ; Tue, 11 Mar 2014 17:44:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754938AbaCKRnM (ORCPT ); Tue, 11 Mar 2014 13:43:12 -0400 Received: from mail-ie0-f171.google.com ([209.85.223.171]:65384 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755241AbaCKRnH (ORCPT ); Tue, 11 Mar 2014 13:43:07 -0400 Received: by mail-ie0-f171.google.com with SMTP id ar20so9396316iec.30 for ; Tue, 11 Mar 2014 10:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=Kvh9E7/Dwd7cLAw+ieVJTUwbHaJ33tdLYthQbyToLoc=; b=mvdob4fMeuFUy4t4FjLyxWqfENEKUg9czsNak65d+MFW+L+iZorkQY5pDIXo2drT42 7qLKwRAm2rMOuMkRd3KEZcUiyE+v97Dh1FNaCTdAwORyBejTN9cDvfeTZLxvZ6m+DBBg /a2+YHC2YwVT6yb77tJtTHdkfVZ4o2ft56MkROofZn8iusRlL2oIsPaOqSvYo8eYhhtq bHrHooBii/4mFKbileQuygQIbrpDpoUj1ZRWi50s/h9pVX7WKu8z2tJ9GglQtEnWLURE SUaqOdtfCd4oJ3e7aCuBvozngCwAEJlR0cb6JOTrpfLFUNg4BSJQtVmgWzOV0CA9gsqQ WzKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=Kvh9E7/Dwd7cLAw+ieVJTUwbHaJ33tdLYthQbyToLoc=; b=JVX/kLtgq32umHMGk1XesdeWjy4rrPEjTwXDJP6IYMn05fRGpDCwkYcMTyN9BdZb8F igY22kZhFk3c3UA2RHlEMottloC+T5OXLhe00wb9ebWDROoKvTDjnbp6OX2cimqSfmTE 3u7aLM4THx6ESRLhdCLLWbEYjzt/bsOMqRnu5IH5ifkkKf7dpnGBdsvPKEz+mAyLCyUl azj/VoDBl2EuDZl3wt1f3GMyslehGJ+9GWjophdLZf1AFhfgwiTPRjvtNc3mMnTAeCsz 2LtrqmdesbkrLcEFG0/O1YQoFuSX+j0EFYaoaiXqyG3L9T0YxYdZrB5H58pFQiBrfu18 1tEQ== X-Gm-Message-State: ALoCoQn8Cs2hlu5eMgt0SBS2ODmNC8fCClGo2nRTaGL1NkTi9k7mD/R/521EeDLaJq9KZV6+TZwfYjio+Bj4IndAREAXbaNXXwGeSKXaUDeJNMKngvB4/J1/RnKvqKsseljjsnPHAKBQGUnxZj2nD+3KIVFMvmUxshTeO106iXTwKAVP17jTm1xk4ZZalD8+OqjGVlZUINtQ3WRwF0K3s6Jg6+jXMKdrucaIaaI7FcOuMYBpH9Rsit0= X-Received: by 10.43.58.19 with SMTP id wi19mr3023646icb.53.1394559786921; Tue, 11 Mar 2014 10:43:06 -0700 (PDT) Received: from localhost ([172.16.50.109]) by mx.google.com with ESMTPSA id w9sm49654771iga.10.2014.03.11.10.43.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Mar 2014 10:43:06 -0700 (PDT) Subject: [PATCH 4/5] PCI: Change pci_bus_alloc_resource() type_mask to unsigned long To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Paul Bolle , Yinghai Lu , linux-kernel@vger.kernel.org Date: Tue, 11 Mar 2014 11:43:05 -0600 Message-ID: <20140311174305.23084.39517.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140311173556.23084.57635.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140311173556.23084.57635.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The pci_bus_alloc_resource() "type_mask" parameter is used to compare with the "flags" member of a struct resource, so it should be the same type, namely "unsigned long". No functional change because all current IORESOURCE_* flags fit in 32 bits. Signed-off-by: Bjorn Helgaas --- drivers/pci/bus.c | 4 ++-- include/linux/pci.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index e3bdc88668ec..fb8aed307c28 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -132,7 +132,7 @@ static void pci_clip_resource_to_region(struct pci_bus *bus, static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, resource_size_t size, resource_size_t align, - resource_size_t min, unsigned int type_mask, + resource_size_t min, unsigned long type_mask, resource_size_t (*alignf)(void *, const struct resource *, resource_size_t, @@ -200,7 +200,7 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, */ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, resource_size_t align, - resource_size_t min, unsigned int type_mask, + resource_size_t min, unsigned long type_mask, resource_size_t (*alignf)(void *, const struct resource *, resource_size_t, diff --git a/include/linux/pci.h b/include/linux/pci.h index fb57c892b214..60ebc17fe909 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1066,7 +1066,7 @@ void pci_bus_remove_resources(struct pci_bus *bus); int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, resource_size_t align, resource_size_t min, - unsigned int type_mask, + unsigned long type_mask, resource_size_t (*alignf)(void *, const struct resource *, resource_size_t,