xen-pciback: drop rom_init()

[mirror_ubuntu-bionic-kernel.git] / drivers / xen / xen-pciback / conf_space_header.c

diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c
index 9ead1c2ff1ddd2e1340e57c70db6b53a7b34665e..5165c989beab408b1efbff1ff5ca62c995be1319 100644 (file)
--- a/drivers/xen/xen-pciback/conf_space_header.c
+++ b/drivers/xen/xen-pciback/conf_space_header.c
@@ -210,8 +210,7 @@ static int bar_read(struct pci_dev *dev, int offset, u32 * value, void *data)
 }
 
 static inline void read_dev_bar(struct pci_dev *dev,
-                               struct pci_bar_info *bar_info, int offset,
-                               u32 len_mask)
+                               struct pci_bar_info *bar_info, int offset)
 {
        int     pos;
        struct resource *res = dev->resource;
@@ -248,19 +247,7 @@ static void *bar_init(struct pci_dev *dev, int offset)
        if (!bar)
                return ERR_PTR(-ENOMEM);
 
-       read_dev_bar(dev, bar, offset, ~0);
-
-       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, ~PCI_ROM_ADDRESS_ENABLE);
+       read_dev_bar(dev, bar, offset);
 
        return bar;
 }
@@ -383,7 +370,7 @@ static const struct config_field header_common[] = {
        {                                               \
        .offset     = reg_offset,                       \
        .size       = 4,                                \
-       .init       = rom_init,                         \
+       .init       = bar_init,                         \
        .reset      = bar_reset,                        \
        .release    = bar_release,                      \
        .u.dw.read  = bar_read,                         \