[PATCH v4 2/7] xen-pciback: drop rom_init()
From: Jan Beulich
Date: Wed Jul 06 2016 - 02:57:16 EST
It is now identical to bar_init().
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
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, \