From: Jan Beulich Date: Wed, 6 Jul 2016 06:57:07 +0000 (-0600) Subject: xen-pciback: drop rom_init() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=664093bb6b797c8ba0a525ee0a36ad8cbf89413e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git xen-pciback: drop rom_init() It is now identical to bar_init(). Signed-off-by: Jan Beulich Signed-off-by: David Vrabel --- diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c index 258d99dd2151..5165c989beab 100644 --- a/drivers/xen/xen-pciback/conf_space_header.c +++ b/drivers/xen/xen-pciback/conf_space_header.c @@ -252,18 +252,6 @@ static void *bar_init(struct pci_dev *dev, int offset) 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_common[] = { { \ .offset = reg_offset, \ .size = 4, \ - .init = rom_init, \ + .init = bar_init, \ .reset = bar_reset, \ .release = bar_release, \ .u.dw.read = bar_read, \