Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1437493
| From | "Jan Beulich" <JBeulich@suse.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v4 3/7] xen-pciback: fold read_dev_bar() into its now single caller |
| Date | 2016-07-06 09:00 +0200 |
| Message-ID | <rROYp-5Ma-13@gated-at.bofh.it> (permalink) |
| References | <rROOJ-5IG-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
drivers/xen/xen-pciback/conf_space_header.c | 33 +++++++++++-----------------
1 file changed, 13 insertions(+), 20 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
@@ -209,11 +209,14 @@ static int bar_read(struct pci_dev *dev,
return 0;
}
-static inline void read_dev_bar(struct pci_dev *dev,
- struct pci_bar_info *bar_info, int offset)
+static void *bar_init(struct pci_dev *dev, int offset)
{
int pos;
struct resource *res = dev->resource;
+ struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL);
+
+ if (!bar)
+ return ERR_PTR(-ENOMEM);
if (offset == PCI_ROM_ADDRESS || offset == PCI_ROM_ADDRESS1)
pos = PCI_ROM_RESOURCE;
@@ -223,31 +226,21 @@ static inline void read_dev_bar(struct p
PCI_BASE_ADDRESS_MEM_TYPE_MASK)) ==
(PCI_BASE_ADDRESS_SPACE_MEMORY |
PCI_BASE_ADDRESS_MEM_TYPE_64))) {
- bar_info->val = res[pos - 1].start >> 32;
- bar_info->len_val = -resource_size(&res[pos - 1]) >> 32;
- return;
+ bar->val = res[pos - 1].start >> 32;
+ bar->len_val = -resource_size(&res[pos - 1]) >> 32;
+ return bar;
}
}
if (!res[pos].flags ||
(res[pos].flags & (IORESOURCE_DISABLED | IORESOURCE_UNSET |
IORESOURCE_BUSY)))
- return;
-
- bar_info->val = res[pos].start |
- (res[pos].flags & PCI_REGION_FLAG_MASK);
- bar_info->len_val = -resource_size(&res[pos]) |
- (res[pos].flags & PCI_REGION_FLAG_MASK);
-}
-
-static void *bar_init(struct pci_dev *dev, int offset)
-{
- struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL);
-
- if (!bar)
- return ERR_PTR(-ENOMEM);
+ return bar;
- read_dev_bar(dev, bar, offset);
+ bar->val = res[pos].start |
+ (res[pos].flags & PCI_REGION_FLAG_MASK);
+ bar->len_val = -resource_size(&res[pos]) |
+ (res[pos].flags & PCI_REGION_FLAG_MASK);
return bar;
}
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v4 0/7] xen-pciback: misc cleanup "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 08:50 +0200 [PATCH v4 2/7] xen-pciback: drop rom_init() "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200 [PATCH v4 3/7] xen-pciback: fold read_dev_bar() into its now single caller "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200 [PATCH v4 1/7] xen-pciback: drop unused function parameter of read_dev_bar() "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200 [PATCH v4 4/7] xen-pciback: simplify determination of 64-bit memory resource "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200 [PATCH v4 6/7] xen-pciback: short-circuit read path used for merging write values "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200 [PATCH v4 5/7] xen-pciback: use const and unsigned in bar_init() "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200 [PATCH v4 7/7] xen-pciback: drop superfluous variables "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:10 +0200 Re: [Xen-devel] [PATCH v4 0/7] xen-pciback: misc cleanup David Vrabel <david.vrabel@citrix.com> - 2016-07-06 11:50 +0200
csiph-web