Skip to contentSkip to conversation

firewire: core: code cleanup after vm_map_pages_zero introduction

PATCH New Stefan Richter 1 participant 1 message Nov 5, 2019 Firewire

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firewire: core: code cleanup after vm_map_pages_zero introduction

Commit 22660db89262 turned fw_iso_buffer_map_vma into a one-liner. There is no need to keep this in the core-iso.c collection of buffer management functions; put it inline into the sole user, the character device file driver.

---
 drivers/firewire/core-cdev.c |    3 ++-
 drivers/firewire/core-iso.c  |    7 -------
 drivers/firewire/core.h      |    2 --
 3 files changed, 2 insertions(+), 10 deletions(-)
drivers/firewire/core-cdev.c +2 -1
@@ -1694,7 +1694,8 @@ static int fw_device_op_mmap(struct file
 	if (ret < 0)
 		goto fail;
 
-	ret = fw_iso_buffer_map_vma(&client->buffer, vma);
+	ret = vm_map_pages_zero(vma, client->buffer.pages,
+				client->buffer.page_count);
 	if (ret < 0)
 		goto fail;
 
drivers/firewire/core-iso.c +0 -7
@@ -91,13 +91,6 @@ int fw_iso_buffer_init(struct fw_iso_buf
 }
 EXPORT_SYMBOL(fw_iso_buffer_init);
 
-int fw_iso_buffer_map_vma(struct fw_iso_buffer *buffer,
-			  struct vm_area_struct *vma)
-{
-	return vm_map_pages_zero(vma, buffer->pages,
-					buffer->page_count);
-}
-
 void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer,
 			   struct fw_card *card)
 {
drivers/firewire/core.h +0 -2
@@ -158,8 +158,6 @@ void fw_node_event(struct fw_card *card,
 int fw_iso_buffer_alloc(struct fw_iso_buffer *buffer, int page_count);
 int fw_iso_buffer_map_dma(struct fw_iso_buffer *buffer, struct fw_card *card,
 			  enum dma_data_direction direction);
-int fw_iso_buffer_map_vma(struct fw_iso_buffer *buffer,
-			  struct vm_area_struct *vma);
 
 
 /* -topology */
Signature · 3 lines
Stefan Richter
-======---== =-== --=-=
http://arcgraph.de/sr/