From patchwork Wed Feb 26 23:41:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3729191 X-Patchwork-Delegate: lethal@linux-sh.org Return-Path: X-Original-To: patchwork-linux-sh@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 5AA12BF13A for ; Wed, 26 Feb 2014 23:44:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82F3520149 for ; Wed, 26 Feb 2014 23:44:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC64320211 for ; Wed, 26 Feb 2014 23:44:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751700AbaBZXmC (ORCPT ); Wed, 26 Feb 2014 18:42:02 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:39715 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754495AbaBZXl7 (ORCPT ); Wed, 26 Feb 2014 18:41:59 -0500 Received: by mail-ie0-f181.google.com with SMTP id lx4so1311184iec.26 for ; Wed, 26 Feb 2014 15:41:58 -0800 (PST) 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=hE+nKSFl9MXDpuNfKNMM9k0lL5sQ3Ue472odOSqoLPY=; b=lxqo9dHMeXvOQMGIxeOO3BQGLa/UA6nq9EnGUwZBVxk6yjGEgIuUHDzQGti3xuBf7b EBSeWzWtNoR3UeiPbQeLSHsAfiA0gvtvdMhX0xw7oijtzH5+yz6m8ZuwmtW6K+I4Vd0F 4VwCzqwCHB+IOtiD0uMSJaEgJbZuTyH/crYLrKDHAZuaNMMjviMp8o4EDyTMjv7kUtNu ARMP5MXQmai71XalBsteeecXyFe9FWLwa6O3Q9/VI9olavTHVXnvp4d7LBrCfYTRDv7s db6ishEt1ojAB9MY+rffIxEQvsQG89AqbMJsuMfq4vqFit70IR2BEQHYE2XZg9oXGoIP kG1g== 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=hE+nKSFl9MXDpuNfKNMM9k0lL5sQ3Ue472odOSqoLPY=; b=aTvJZZwdPEYXXNEmhNXCstwmJqA5giEkXGjMeihdpr52XhNfjto+TWFL+ytreEtzdS ZUU7LPJJYwKE9qTnRQiXdb7Q+TXHHxnymuI33nfW28LVlxO35xac33HtNm2hVsHpvzYB FHZvV4wgTUafC5dEq0FQs8Ow9LCJ0ZkmsS7tJs4nLy2m0xzpv5S8MFcI8KjMx24Kg9t9 sUzihJ492e5ZiITF5PLZ2VX+/5f5BrPxsk84T0Cb9Ve3M6dmE/X+V+2BhKySEfEKFMrA tZzAzxvHgBLjuX5hpGch9JA/FDZNQUYx9DJKPfJz6CYoru7pm2ZaQ83kMFQEr9/LgVTx OL9g== X-Gm-Message-State: ALoCoQkcJaOEPrTUU7B/cgzLfoW4ZRRsDhwxf2ek8cgmCFRwXACMyftT/CslaN0fGkX+ljK7yEL8jhupUhMqz2aoj9mlNF276WdmoSoEZf3VtN9WFP4Vu+EgLVJW2K2F8SOhJmlg8NAAJUtqOLrlmrpt2bfSFDayYO7DwHDXmS8CF+RY47hpdtlo9OmzcInSbsnKJnLRzk0v7o1h1MaAAd8cH0HrpuoQtQ== X-Received: by 10.42.232.206 with SMTP id jv14mr2193287icb.52.1393458118328; Wed, 26 Feb 2014 15:41:58 -0800 (PST) Received: from localhost ([172.16.49.60]) by mx.google.com with ESMTPSA id m6sm4618741igx.9.2014.02.26.15.41.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 26 Feb 2014 15:41:57 -0800 (PST) Subject: [PATCH 4/7] sh/PCI: Use default pcibios_enable_device() To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Paul Mundt , linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Date: Wed, 26 Feb 2014 16:41:55 -0700 Message-ID: <20140226234155.18970.93520.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140226233541.18970.83328.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140226233541.18970.83328.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 We don't need anything arch-specific in pcibios_enable_device(), so drop the arch implementation and use the default generic one. Signed-off-by: Bjorn Helgaas CC: Paul Mundt CC: linux-sh@vger.kernel.org --- arch/sh/drivers/pci/pci.c | 5 ----- 1 file changed, 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 60ed3e1c4b75..1bc09ee7948f 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -186,11 +186,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, return start; } -int pcibios_enable_device(struct pci_dev *dev, int mask) -{ - return pci_enable_resources(dev, mask); -} - static void __init pcibios_bus_report_status_early(struct pci_channel *hose, int top_bus, int current_bus,