From patchwork Mon Jun 6 08:47:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9157493 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE17060467 for ; Mon, 6 Jun 2016 08:51:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2DF9254F7 for ; Mon, 6 Jun 2016 08:51:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C62322780C; Mon, 6 Jun 2016 08:51:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 57410254F7 for ; Mon, 6 Jun 2016 08:51:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b9qCL-0003hC-6G; Mon, 06 Jun 2016 08:47:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b9qCI-0003h0-Vi for xen-devel@lists.xenproject.org; Mon, 06 Jun 2016 08:47:47 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id D6/CF-14748-2B835575; Mon, 06 Jun 2016 08:47:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsXS6fjDS3ejRWi 4wfllQhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aq73+ZC6ZwVkyf9JSpgXE9excjJ4eQQJ7E zH1NYDavgJ3EvNUtYLaEgKHEvvmr2EBsFgFViXMPLjCD2GwC6hJtz7azdjFycYgIXGOUmH31M CtIglkgUGLu7J0sILYwUPPCE90sEAvsJJb2vmcCsTkF7CWuvV0ONJQDaJmgxN8dwhCtWhIPf9 1igbC1JZYtfM0MUsIsIC2x/B/HBEa+WQgNs5A0zELSMAuhYQEjyypGjeLUorLUIl1DI72kosz 0jJLcxMwcXUNDE73c1OLixPTUnMSkYr3k/NxNjMDwYwCCHYxnpzkfYpTkYFIS5ZX9GhIuxJeU n1KZkVicEV9UmpNafIhRhoNDSYJ3pnlouJBgUWp6akVaZg4wEmDSEhw8SiK80SBp3uKCxNziz HSI1ClGRSlx3jKQhABIIqM0D64NFn2XGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMx7FGQKT2 ZeCdz0V0CLmYAWL7sWDLK4JBEhJdXAmNZj7f6d08tWQrFR7F5Q9yuVUuPFZeaKRtdTVq/bFcJ 2v+hWy8T3OWf0L7iLlF5+Yhgcf+Vvh1OAuJZ+wj2e1xu3t/7Zs/LH8wu9PWp8Sl8TZ95eUv0k 0LNY56vA1PLJ3hbykt8T7m+USOwP5D/Gl/ye5+3Rx+e2trpF/HD2LPweuv1RWV24EktxRqKhF nNRcSIATiiYcrkCAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1465202863!45983948!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58390 invoked from network); 6 Jun 2016 08:47:44 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Jun 2016 08:47:44 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Mon, 06 Jun 2016 02:47:42 -0600 Message-Id: <575554CC02000078000F1E3F@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Mon, 06 Jun 2016 02:47:40 -0600 From: "Jan Beulich" To: "David Vrabel" , "Boris Ostrovsky" , "Konrad Rzeszutek Wilk" , "Jan Beulich" ,"Juergen Gross" References: <57554B8D02000078000F1DE4@prv-mh.provo.novell.com> In-Reply-To: <57554B8D02000078000F1DE4@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel , linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH 3/2] xen-pciback: drop rom_init() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP It's identical to bar_init() now. Signed-off-by: Jan Beulich --- I'm sorry for this 3/2 - I only now noticed that this additional simplification is now possible. --- drivers/xen/xen-pciback/conf_space_header.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) --- 4.7-rc2-xen-pciback-BAR.orig/drivers/xen/xen-pciback/conf_space_header.c +++ 4.7-rc2-xen-pciback-BAR/drivers/xen/xen-pciback/conf_space_header.c @@ -250,18 +250,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; @@ -380,7 +368,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, \