[Xen-devel] [PATCH 3/2] xen-pciback: drop rom_init()

["Jan Beulich" <JBeulich@xxxxxxxx>]

It's identical to bar_init() now.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
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,                         \




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel