Commit 9b326948 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 

Pull FireWire updates from Stefan Richter:

 - another y2038 fix

 - janitorial code movement

* tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: core: code cleanup after vm_map_pages_zero introduction
  firewire: ohci: stop using get_seconds() for BUS_TIME
parents ef2cc88e 7807759e

drivers/firewire/core-cdev.c

+2 −1
Original line number Diff line number Diff line
@@ -1686,7 +1686,8 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma) 
	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
Original line number Diff line number Diff line
@@ -91,13 +91,6 @@ int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card, 
}

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
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event); 
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 */

drivers/firewire/ohci.c

+1 −1
Original line number Diff line number Diff line
@@ -1752,7 +1752,7 @@ static u32 update_bus_time(struct fw_ohci *ohci) 


	if (unlikely(!ohci->bus_time_running)) {

		reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_cycle64Seconds);

		ohci->bus_time = (lower_32_bits(get_seconds()) & ~0x7f) |

		ohci->bus_time = (lower_32_bits(ktime_get_seconds()) & ~0x7f) |

		                 (cycle_time_seconds & 0x40);

		ohci->bus_time_running = true;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE