Commit f657a680 authored by Takashi Sakamoto's avatar Takashi Sakamoto
Browse files

firewire: core: use from_work() macro to expand parent structure of work_struct 

A commit 60b2ebf4 ("workqueue: Introduce from_work() helper for cleaner
callback declarations") introduces a new macro to retrieve a poiner for the
parent structure of the work item. It is convenient to reduce input text.

This commit uses the macro in core functionalities.

Link: https://lore.kernel.org/r/20250608233808.202355-3-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
parent 8ffef793

drivers/firewire/core-card.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ EXPORT_SYMBOL(fw_schedule_bus_reset); 


static void br_work(struct work_struct *work)

{

	struct fw_card *card = container_of(work, struct fw_card, br_work.work);

	struct fw_card *card = from_work(card, work, br_work.work);



	/* Delay for 2s after last reset per IEEE 1394 clause 8.2.1. */

	if (card->reset_jiffies != 0 &&
@@ -286,7 +286,7 @@ void fw_schedule_bm_work(struct fw_card *card, unsigned long delay) 


static void bm_work(struct work_struct *work)

{

	struct fw_card *card = container_of(work, struct fw_card, bm_work.work);

	struct fw_card *card = from_work(card, work, bm_work.work);

	struct fw_device *root_device, *irm_device;

	struct fw_node *root_node;

	int root_id, new_root_id, irm_id, bm_id, local_id;

drivers/firewire/core-cdev.c

+1 −2
Original line number Diff line number Diff line
@@ -1313,8 +1313,7 @@ static int ioctl_get_cycle_timer(struct client *client, union ioctl_arg *arg) 
static void iso_resource_work(struct work_struct *work)

{

	struct iso_resource_event *e;

	struct iso_resource *r =

			container_of(work, struct iso_resource, work.work);

	struct iso_resource *r = from_work(r, work, work.work);

	struct client *client = r->client;

	unsigned long index = r->resource.handle;

	int generation, channel, bandwidth, todo;

drivers/firewire/core-device.c

+5 −10
Original line number Diff line number Diff line
@@ -853,8 +853,7 @@ static void fw_schedule_device_work(struct fw_device *device, 


static void fw_device_shutdown(struct work_struct *work)

{

	struct fw_device *device =

		container_of(work, struct fw_device, work.work);

	struct fw_device *device = from_work(device, work, work.work);



	if (time_before64(get_jiffies_64(),

			  device->card->reset_jiffies + SHUTDOWN_DELAY)
@@ -921,8 +920,7 @@ static int update_unit(struct device *dev, void *data) 


static void fw_device_update(struct work_struct *work)

{

	struct fw_device *device =

		container_of(work, struct fw_device, work.work);

	struct fw_device *device = from_work(device, work, work.work);



	fw_device_cdev_update(device);

	device_for_each_child(&device->device, NULL, update_unit);
@@ -1002,8 +1000,7 @@ static int compare_configuration_rom(struct device *dev, const void *data) 


static void fw_device_init(struct work_struct *work)

{

	struct fw_device *device =

		container_of(work, struct fw_device, work.work);

	struct fw_device *device = from_work(device, work, work.work);

	struct fw_card *card = device->card;

	struct device *found;

	u32 minor;
@@ -1184,8 +1181,7 @@ static int reread_config_rom(struct fw_device *device, int generation, 


static void fw_device_refresh(struct work_struct *work)

{

	struct fw_device *device =

		container_of(work, struct fw_device, work.work);

	struct fw_device *device = from_work(device, work, work.work);

	struct fw_card *card = device->card;

	int ret, node_id = device->node_id;

	bool changed;
@@ -1251,8 +1247,7 @@ static void fw_device_refresh(struct work_struct *work) 


static void fw_device_workfn(struct work_struct *work)

{

	struct fw_device *device = container_of(to_delayed_work(work),

						struct fw_device, work);

	struct fw_device *device = from_work(device, to_delayed_work(work), work);

	device->workfn(work);

}