Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbf19db3 authored by Kristian Høgsberg's avatar Kristian Høgsberg Committed by Stefan Richter
Browse files

firewire: Use atomic_t's for serial numbers. 



Signed-off-by: default avatarKristian Høgsberg <krh@redhat.com>

Use atomic_inc_return.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 362c2c8c

drivers/firewire/fw-card.c

+2 −2
Original line number Diff line number Diff line
@@ -367,9 +367,9 @@ void 
fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,

		   struct device *device)

{

	static int index;

	static atomic_t index = ATOMIC_INIT(-1);



	card->index = index++;

	card->index = atomic_inc_return(&index);

	card->driver = driver;

	card->device = device;

	card->current_tlabel = 0;

drivers/firewire/fw-device.c

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void fw_device_shutdown(struct work_struct *work) 


static void fw_device_init(struct work_struct *work)

{

	static int serial;

	static atomic_t serial = ATOMIC_INIT(-1);

	struct fw_device *device =

		container_of(work, struct fw_device, work.work);
@@ -460,7 +460,7 @@ static void fw_device_init(struct work_struct *work) 
	device->device.release = fw_device_release;

	device->device.parent = device->card->device;

	snprintf(device->device.bus_id, sizeof device->device.bus_id,

		 "fw%d", serial++);

		 "fw%d", atomic_inc_return(&serial));



	if (alloc_chrdev_region(&device->device.devt, 0, 1, "fw")) {

		fw_error("Failed to register char device region.\n");