firewire: normalize style of queue_work wrappers

A few stylistic changes to unify some code patterns in the subsystem: - The similar queue_delayed_work helpers fw_schedule_bm_work, schedule_iso_resource, and sbp2_queue_work now have the same call convention. - Two conditional calls of schedule_iso_resource are factored into another small helper. - An sbp2_target_get helper is added as counterpart to sbp2_target_put. Object size of firewire-core is decreased a little bit, object size of firewire-sbp2 remains unchanged. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

firewire: normalize style of queue_work wrappers
A few stylistic changes to unify some code patterns in the subsystem: - The similar queue_delayed_work helpers fw_schedule_bm_work, schedule_iso_resource, and sbp2_queue_work now have the same call convention. - Two conditional calls of schedule_iso_resource are factored into another small helper. - An sbp2_target_get helper is added as counterpart to sbp2_target_put. Object size of firewire-core is decreased a little bit, object size of firewire-sbp2 remains unchanged. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Stefan Richter
1 parent 7e44c0b56b
Showing 3 changed files with 27 additions and 25 deletions Side-by-side Diff
drivers/firewire/core-card.c
drivers/firewire/core-cdev.c
drivers/firewire/sbp2.c
@@ -211,11 +211,8 @@
  
 void fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
 {
-	int scheduled;
-
 	fw_card_get(card);
-	scheduled = schedule_delayed_work(&card->work, delay);
-	if (!scheduled)
+	if (!schedule_delayed_work(&card->work, delay))
 		fw_card_put(card);
 }
  
@@ -129,9 +129,22 @@
 	struct iso_resource_event *e_alloc, *e_dealloc;
 };
  
-static void schedule_iso_resource(struct iso_resource *);
 static void release_iso_resource(struct client *, struct client_resource *);
  
+static void schedule_iso_resource(struct iso_resource *r, unsigned long delay)
+{
+	client_get(r->client);
+	if (!schedule_delayed_work(&r->work, delay))
+		client_put(r->client);
+}
+
+static void schedule_if_iso_resource(struct client_resource *resource)
+{
+	if (resource->release == release_iso_resource)
+		schedule_iso_resource(container_of(resource,
+					struct iso_resource, resource), 0);
+}
+
 /*
  * dequeue_event() just kfree()'s the event, so the event has to be
  * the first field in a struct XYZ_event.
  
@@ -313,11 +326,8 @@
  
 static int schedule_reallocations(int id, void *p, void *data)
 {
-	struct client_resource *r = p;
+	schedule_if_iso_resource(p);
  
-	if (r->release == release_iso_resource)
-		schedule_iso_resource(container_of(r,
-					struct iso_resource, resource));
 	return 0;
 }
  
@@ -413,9 +423,7 @@
 				  &resource->handle);
 	if (ret >= 0) {
 		client_get(client);
-		if (resource->release == release_iso_resource)
-			schedule_iso_resource(container_of(resource,
-						struct iso_resource, resource));
+		schedule_if_iso_resource(resource);
 	}
 	spin_unlock_irqrestore(&client->lock, flags);
  
@@ -1032,8 +1040,7 @@
 	/* Allow 1000ms grace period for other reallocations. */
 	if (todo == ISO_RES_ALLOC &&
 	    time_is_after_jiffies(client->device->card->reset_jiffies + HZ)) {
-		if (schedule_delayed_work(&r->work, DIV_ROUND_UP(HZ, 3)))
-			client_get(client);
+		schedule_iso_resource(r, DIV_ROUND_UP(HZ, 3));
 		skip = true;
 	} else {
 		/* We could be called twice within the same generation. */
@@ -1118,13 +1125,6 @@
 	client_put(client);
 }
  
-static void schedule_iso_resource(struct iso_resource *r)
-{
-	client_get(r->client);
-	if (!schedule_delayed_work(&r->work, 0))
-		client_put(r->client);
-}
-
 static void release_iso_resource(struct client *client,
 				 struct client_resource *resource)
 {
@@ -1133,7 +1133,7 @@
  
 	spin_lock_irq(&client->lock);
 	r->todo = ISO_RES_DEALLOC;
-	schedule_iso_resource(r);
+	schedule_iso_resource(r, 0);
 	spin_unlock_irq(&client->lock);
 }
  
@@ -1179,7 +1179,7 @@
 	} else {
 		r->resource.release = NULL;
 		r->resource.handle = -1;
-		schedule_iso_resource(r);
+		schedule_iso_resource(r, 0);
 	}
 	request->handle = r->resource.handle;
  
@@ -820,20 +820,25 @@
 	fw_device_put(device);
 }
  
-static struct workqueue_struct *sbp2_wq;
+static void sbp2_target_get(struct sbp2_target *tgt)
+{
+	kref_get(&tgt->kref);
+}
  
 static void sbp2_target_put(struct sbp2_target *tgt)
 {
 	kref_put(&tgt->kref, sbp2_release_target);
 }
  
+static struct workqueue_struct *sbp2_wq;
+
 /*
  * Always get the target's kref when scheduling work on one its units.
  * Each workqueue job is responsible to call sbp2_target_put() upon return.
  */
 static void sbp2_queue_work(struct sbp2_logical_unit *lu, unsigned long delay)
 {
-	kref_get(&lu->tgt->kref);
+	sbp2_target_get(lu->tgt);
 	if (!queue_delayed_work(sbp2_wq, &lu->work, delay))
 		sbp2_target_put(lu->tgt);
 }
...	...	@@ -211,11 +211,8 @@
211	211
212	212	void fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
213	213	{
214		- int scheduled;
215		-
216	214	fw_card_get(card);
217		- scheduled = schedule_delayed_work(&card->work, delay);
218		- if (!scheduled)
	215	+ if (!schedule_delayed_work(&card->work, delay))
219	216	fw_card_put(card);
220	217	}
221	218
...	...	@@ -129,9 +129,22 @@
129	129	struct iso_resource_event e_alloc, e_dealloc;
130	130	};
131	131
132		-static void schedule_iso_resource(struct iso_resource *);
133	132	static void release_iso_resource(struct client , struct client_resource );
134	133
	134	+static void schedule_iso_resource(struct iso_resource *r, unsigned long delay)
	135	+{
	136	+ client_get(r->client);
	137	+ if (!schedule_delayed_work(&r->work, delay))
	138	+ client_put(r->client);
	139	+}
	140	+
	141	+static void schedule_if_iso_resource(struct client_resource *resource)
	142	+{
	143	+ if (resource->release == release_iso_resource)
	144	+ schedule_iso_resource(container_of(resource,
	145	+ struct iso_resource, resource), 0);
	146	+}
	147	+
135	148	/*
136	149	* dequeue_event() just kfree()'s the event, so the event has to be
137	150	* the first field in a struct XYZ_event.
138	151
...	...	@@ -313,11 +326,8 @@
313	326
314	327	static int schedule_reallocations(int id, void p, void data)
315	328	{
316		- struct client_resource *r = p;
	329	+ schedule_if_iso_resource(p);
317	330
318		- if (r->release == release_iso_resource)
319		- schedule_iso_resource(container_of(r,
320		- struct iso_resource, resource));
321	331	return 0;
322	332	}
323	333
...	...	@@ -413,9 +423,7 @@
413	423	&resource->handle);
414	424	if (ret >= 0) {
415	425	client_get(client);
416		- if (resource->release == release_iso_resource)
417		- schedule_iso_resource(container_of(resource,
418		- struct iso_resource, resource));
	426	+ schedule_if_iso_resource(resource);
419	427	}
420	428	spin_unlock_irqrestore(&client->lock, flags);
421	429
...	...	@@ -1032,8 +1040,7 @@
1032	1040	/* Allow 1000ms grace period for other reallocations. */
1033	1041	if (todo == ISO_RES_ALLOC &&
1034	1042	time_is_after_jiffies(client->device->card->reset_jiffies + HZ)) {
1035		- if (schedule_delayed_work(&r->work, DIV_ROUND_UP(HZ, 3)))
1036		- client_get(client);
	1043	+ schedule_iso_resource(r, DIV_ROUND_UP(HZ, 3));
1037	1044	skip = true;
1038	1045	} else {
1039	1046	/* We could be called twice within the same generation. */
...	...	@@ -1118,13 +1125,6 @@
1118	1125	client_put(client);
1119	1126	}
1120	1127
1121		-static void schedule_iso_resource(struct iso_resource *r)
1122		-{
1123		- client_get(r->client);
1124		- if (!schedule_delayed_work(&r->work, 0))
1125		- client_put(r->client);
1126		-}
1127		-
1128	1128	static void release_iso_resource(struct client *client,
1129	1129	struct client_resource *resource)
1130	1130	{
...	...	@@ -1133,7 +1133,7 @@
1133	1133
1134	1134	spin_lock_irq(&client->lock);
1135	1135	r->todo = ISO_RES_DEALLOC;
1136		- schedule_iso_resource(r);
	1136	+ schedule_iso_resource(r, 0);
1137	1137	spin_unlock_irq(&client->lock);
1138	1138	}
1139	1139
...	...	@@ -1179,7 +1179,7 @@
1179	1179	} else {
1180	1180	r->resource.release = NULL;
1181	1181	r->resource.handle = -1;
1182		- schedule_iso_resource(r);
	1182	+ schedule_iso_resource(r, 0);
1183	1183	}
1184	1184	request->handle = r->resource.handle;
1185	1185
...	...	@@ -820,20 +820,25 @@
820	820	fw_device_put(device);
821	821	}
822	822
823		-static struct workqueue_struct *sbp2_wq;
	823	+static void sbp2_target_get(struct sbp2_target *tgt)
	824	+{
	825	+ kref_get(&tgt->kref);
	826	+}
824	827
825	828	static void sbp2_target_put(struct sbp2_target *tgt)
826	829	{
827	830	kref_put(&tgt->kref, sbp2_release_target);
828	831	}
829	832
	833	+static struct workqueue_struct *sbp2_wq;
	834	+
830	835	/*
831	836	* Always get the target's kref when scheduling work on one its units.
832	837	* Each workqueue job is responsible to call sbp2_target_put() upon return.
833	838	*/
834	839	static void sbp2_queue_work(struct sbp2_logical_unit *lu, unsigned long delay)
835	840	{
836		- kref_get(&lu->tgt->kref);
	841	+ sbp2_target_get(lu->tgt);
837	842	if (!queue_delayed_work(sbp2_wq, &lu->work, delay))
838	843	sbp2_target_put(lu->tgt);
839	844	}