xen/xenbus: remove unused xenbus_map_ring()
Juergen Gross
maintainerPATCH 1/1 xen/xenbus: remove unused xenbus_map_ring()
xenbus_map_ring() is used nowhere in the tree, remove it. xenbus_unmap_ring() is used only locally, so make it static and move it up.
Signed-off-by Juergen Gross <[email protected]>
--- drivers/xen/xenbus/xenbus_client.c | 126 +++++++++++++------------------------ include/xen/xenbus.h | 7 --- 2 files changed, 42 insertions(+), 91 deletions(-)
drivers/xen/xenbus/xenbus_client.c +42 -84
@@ -523,6 +523,48 @@ static int __xenbus_map_ring(struct xenbus_device *dev,return err; } +/** +* xenbus_unmap_ring +* @dev: xenbus device +* @handles: grant handle array +* @nr_handles: number of handles in the array +* @vaddrs: addresses to unmap +* +* Unmap memory in this domain that was imported from another domain. +* Returns 0 on success and returns GNTST_* on error +* (see xen/include/interface/grant_table.h). +*/ +static int xenbus_unmap_ring (struct xenbus_device *dev,grant_handle_t *handles, +unsigned int nr_handles,unsigned long *vaddrs) +{ +struct gnttab_unmap_grant_ref unmap[XENBUS_MAX_RING_GRANTS ]; +int i; +int err; + +if (nr_handles >XENBUS_MAX_RING_GRANTS ) +return -EINVAL ; + +for (i =0 ; i < nr_handles; i++) +gnttab_set_unmap_op (&unmap[i], vaddrs[i], + GNTMAP_host_map, handles[i]); + +if (HYPERVISOR_grant_table_op (GNTTABOP_unmap_grant_ref, unmap, i)) +BUG (); + + err = GNTST_okay; +for (i =0 ; i < nr_handles; i++) { +if (unmap[i].status != GNTST_okay) { +xenbus_dev_error (dev, unmap[i].status, +"unmapping page at handle %d error %d" , + handles[i], unmap[i].status); + err = unmap[i].status; +break ; + } + } + +return err; +} +struct map_ring_valloc_hvm {unsigned int idx;
@@ -614,45 +656,6 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev,return err; } - -/** -* xenbus_map_ring -* @dev: xenbus device -* @gnt_refs: grant reference array -* @nr_grefs: number of grant reference -* @handles: pointer to grant handle to be filled -* @vaddrs: addresses to be mapped to -* @leaked: fail to clean up a failed map, caller should not free vaddr -* -* Map pages of memory into this domain from another domain's grant table. -* xenbus_map_ring does not allocate the virtual address space (you must do -* this yourself!). It only maps in the pages to the specified address. -* Returns 0 on success, and GNTST_* (see xen/include/interface/grant_table.h) -* or -ENOMEM / -EINVAL on error. If an error is returned, device will switch to -* XenbusStateClosing and the first error message will be saved in XenStore. -* Further more if we fail to map the ring, caller should check @leaked. -* If @leaked is not zero it means xenbus_map_ring fails to clean up, caller -* should not free the address space of @vaddr. -*/ -int xenbus_map_ring (struct xenbus_device *dev,grant_ref_t *gnt_refs, -unsigned int nr_grefs,grant_handle_t *handles, -unsigned long *vaddrs,bool *leaked) -{ -phys_addr_t phys_addrs[XENBUS_MAX_RING_GRANTS ]; -int i; - -if (nr_grefs >XENBUS_MAX_RING_GRANTS ) -return -EINVAL ; - -for (i =0 ; i < nr_grefs; i++) - phys_addrs[i] = (unsigned long )vaddrs[i]; - -return __xenbus_map_ring (dev, gnt_refs, nr_grefs, handles, - phys_addrs, GNTMAP_host_map, leaked); -} -EXPORT_SYMBOL_GPL (xenbus_map_ring); - -/** * xenbus_unmap_ring_vfree * @dev: xenbus device
@@ -864,51 +867,6 @@ static int xenbus_unmap_ring_vfree_hvm(struct xenbus_device *dev, void *vaddr)return rv; } -/** -* xenbus_unmap_ring -* @dev: xenbus device -* @handles: grant handle array -* @nr_handles: number of handles in the array -* @vaddrs: addresses to unmap -* -* Unmap memory in this domain that was imported from another domain. -* Returns 0 on success and returns GNTST_* on error -* (see xen/include/interface/grant_table.h). -*/ -int xenbus_unmap_ring (struct xenbus_device *dev, -grant_handle_t *handles,unsigned int nr_handles, -unsigned long *vaddrs) -{ -struct gnttab_unmap_grant_ref unmap[XENBUS_MAX_RING_GRANTS ]; -int i; -int err; - -if (nr_handles >XENBUS_MAX_RING_GRANTS ) -return -EINVAL ; - -for (i =0 ; i < nr_handles; i++) -gnttab_set_unmap_op (&unmap[i], vaddrs[i], - GNTMAP_host_map, handles[i]); - -if (HYPERVISOR_grant_table_op (GNTTABOP_unmap_grant_ref, unmap, i)) -BUG (); - - err = GNTST_okay; -for (i =0 ; i < nr_handles; i++) { -if (unmap[i].status != GNTST_okay) { -xenbus_dev_error (dev, unmap[i].status, -"unmapping page at handle %d error %d" , - handles[i], unmap[i].status); - err = unmap[i].status; -break ; - } - } - -return err; -} -EXPORT_SYMBOL_GPL (xenbus_unmap_ring); - -/** * xenbus_read_driver_state * @path: path for driver
include/xen/xenbus.h +0 -7
@@ -209,15 +209,8 @@ int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr, unsigned int nr_pages, grant_ref_t *grefs);int xenbus_map_ring_valloc (struct xenbus_device *dev,grant_ref_t *gnt_refs,unsigned int nr_grefs,void **vaddr); -int xenbus_map_ring (struct xenbus_device *dev, -grant_ref_t *gnt_refs,unsigned int nr_grefs, -grant_handle_t *handles,unsigned long *vaddrs, -bool *leaked);int xenbus_unmap_ring_vfree (struct xenbus_device *dev,void *vaddr); -int xenbus_unmap_ring (struct xenbus_device *dev, -grant_handle_t *handles,unsigned int nr_handles, -unsigned long *vaddrs);int xenbus_alloc_evtchn (struct xenbus_device *dev,int *port);int xenbus_free_evtchn (struct xenbus_device *dev,int port);
Signature · 1 line
2.16.4
Quoted 6 lines · Juergen Gross
xenbus_map_ring()is used nowhere in the tree, remove it.xenbus_unmap_ring()is used only locally, so make it static and move it up.Signed-off-by Juergen Gross <[email protected]>
Reviewed-by Boris Ostrovsky <[email protected]>
Applied to for-linus-5.6b