From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753255AbcGFG5O (ORCPT ); Wed, 6 Jul 2016 02:57:14 -0400 Received: from prv-mh.provo.novell.com ([137.65.248.74]:45384 "EHLO prv-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864AbcGFG5K convert rfc822-to-8bit (ORCPT ); Wed, 6 Jul 2016 02:57:10 -0400 Message-Id: <577CC7E302000078000FB7B4@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Wed, 06 Jul 2016 00:57:07 -0600 From: "Jan Beulich" To: "David Vrabel" , "Boris Ostrovsky" , "Juergen Gross" Cc: "xen-devel" , Subject: [PATCH v4 2/7] xen-pciback: drop rom_init() References: <577CC59602000078000FB7A0@prv-mh.provo.novell.com> In-Reply-To: <577CC59602000078000FB7A0@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is now identical to bar_init(). Signed-off-by: Jan Beulich --- drivers/xen/xen-pciback/conf_space_header.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) --- 4.7-rc6-xen-pciback.orig/drivers/xen/xen-pciback/conf_space_header.c +++ 4.7-rc6-xen-pciback/drivers/xen/xen-pciback/conf_space_header.c @@ -252,18 +252,6 @@ static void *bar_init(struct pci_dev *de return bar; } -static void *rom_init(struct pci_dev *dev, int offset) -{ - struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL); - - if (!bar) - return ERR_PTR(-ENOMEM); - - read_dev_bar(dev, bar, offset); - - return bar; -} - static void bar_reset(struct pci_dev *dev, int offset, void *data) { struct pci_bar_info *bar = data; @@ -382,7 +370,7 @@ static const struct config_field header_ { \ .offset = reg_offset, \ .size = 4, \ - .init = rom_init, \ + .init = bar_init, \ .reset = bar_reset, \ .release = bar_release, \ .u.dw.read = bar_read, \