diff options
author | Jan Beulich <JBeulich@suse.com> | 2016-07-06 02:57:07 -0400 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2016-07-06 05:35:37 -0400 |
commit | 664093bb6b797c8ba0a525ee0a36ad8cbf89413e (patch) | |
tree | 2917a8a50a54f508d8e9e03d02a6f4dd268999c0 /drivers/xen | |
parent | 6c6e4caa2006ab82587a3648967314ec92569a98 (diff) |
xen-pciback: drop rom_init()
It is now identical to bar_init().
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r-- | drivers/xen/xen-pciback/conf_space_header.c | 14 |
1 files changed, 1 insertions, 13 deletions
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) | |||
252 | return bar; | 252 | return bar; |
253 | } | 253 | } |
254 | 254 | ||
255 | static void *rom_init(struct pci_dev *dev, int offset) | ||
256 | { | ||
257 | struct pci_bar_info *bar = kzalloc(sizeof(*bar), GFP_KERNEL); | ||
258 | |||
259 | if (!bar) | ||
260 | return ERR_PTR(-ENOMEM); | ||
261 | |||
262 | read_dev_bar(dev, bar, offset); | ||
263 | |||
264 | return bar; | ||
265 | } | ||
266 | |||
267 | static void bar_reset(struct pci_dev *dev, int offset, void *data) | 255 | static void bar_reset(struct pci_dev *dev, int offset, void *data) |
268 | { | 256 | { |
269 | struct pci_bar_info *bar = data; | 257 | struct pci_bar_info *bar = data; |
@@ -382,7 +370,7 @@ static const struct config_field header_common[] = { | |||
382 | { \ | 370 | { \ |
383 | .offset = reg_offset, \ | 371 | .offset = reg_offset, \ |
384 | .size = 4, \ | 372 | .size = 4, \ |
385 | .init = rom_init, \ | 373 | .init = bar_init, \ |
386 | .reset = bar_reset, \ | 374 | .reset = bar_reset, \ |
387 | .release = bar_release, \ | 375 | .release = bar_release, \ |
388 | .u.dw.read = bar_read, \ | 376 | .u.dw.read = bar_read, \ |