From nobody Sun May 24 23:32:08 2026 Received: from fhigh-b4-smtp.messagingengine.com (fhigh-b4-smtp.messagingengine.com [202.12.124.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A98553D7D97 for ; Wed, 20 May 2026 13:08:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282532; cv=none; b=CQmK5upwU8a9wQ5TAKiPgE5yuupMIWfvqBpH6ukc0x+aF9n9ZJRA/mOEmrNXIhoOcQLn0U9CtGPQJar0aU32Bs7IAWalbYm0KZOP8L0uBrv15Yfc7VfijlUF69uiOLjq87s+IwYTbc+kWrBsk6CURDgYu4UBIKoftNuvL/Y0L1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282532; c=relaxed/simple; bh=yBTlIZ0vn5wlscRlfx/8HJGahB+VkaiG/U90yJI11MA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QbQeSk5gy6BmmN5+phEXr2tqyYkHIYxzHwnYef1gUG797RWte/FxGBgN3TOPWUrPWCn/ZBF9IiAoB2/5jpnjSm1c7JS5QbAkIaawanyyMaPn6cXIbWa9Qs0pSquSkDZ7W9YzKzD9YS8e0o2Lbcd2+dzC8qEkKyA/EJ8sHEDyGa0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=xSpjxukk; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=TyctOcqW; arc=none smtp.client-ip=202.12.124.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="xSpjxukk"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="TyctOcqW" Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id 79BD97A0097; Wed, 20 May 2026 09:08:47 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Wed, 20 May 2026 09:08:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1779282527; x= 1779368927; bh=dDHE0cebI0icyL6l/QSTdD0c81n1IJ4JgBSh0iQW5b4=; b=x SpjxukkWQRRQ63Ax9rwaaWoPNxLrw+vRX9CXG9sAhqslN60JO9LeyrjXEx6GGhUo cjGsNncZ85OStD50NdoSmDwihDsGb92W1RWsUrBaoejb3vqCDr6r7OBB+oa/O1OE F4qNa/gcQjpHJ1RxQlkEaYlHzIKkuSp9iVzI9N4Hqpl3uoC3bh4QPs3fkSw3GiCf Sh6rCRHPTpfxLIn5FArF/9Z/HNVMmbZ4K+UKCFI5y6XS4sW+0xS9k5cnpTuukLX2 qrrrfRC49bxbqBGY73aIIARnX2XfzfSknMEZ+qY5oBj3bW4Op83YTCUIjFY6aikU Fkc6STwaSon0KRo0YN+RQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1779282527; x=1779368927; bh=d DHE0cebI0icyL6l/QSTdD0c81n1IJ4JgBSh0iQW5b4=; b=TyctOcqWn+hGmGQo7 f0lXG265fiuQyHB90MJlD5iztiqptnDXPQK9XKC2YAx+C8hNrCy204GwDJQZtH6W jUnT0y+WtCgSFC8AkpN4eoON2ZLo9rVFyMnGWc31Y3FNXtnt4d4UaMZIYLr2jOgb nJaibuuQ8NWpPTm373d++T+9bgBpjZnBlWO+my4aBgxcHCpdPDtVmTb7zT+VzxR9 wDJ2RAT3gAIrR9NCNuPVMJ81jSim/ZWw5nuTcoEXeLOIMXET9sxPTHWJvBAktyzi enl6Ue91S8BpiLx7Z5ho+D/SHlpflZ+4BsdM1G72I/0Al84QlnfJhamLE9ceS8Lb gy4MQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgddugeegjeduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghkrghs hhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgjeeuvd fguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhisehsrg hkrghmohgttghhihdrjhhppdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhu thdprhgtphhtthhopehlihhnuhigudefleegqdguvghvvghlsehlihhsthhsrdhsohhurh gtvghfohhrghgvrdhnvghtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgv rhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 20 May 2026 09:08:46 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/3] firewire: core: minor code refactoring for case-dependent parameters of iso resources management Date: Wed, 20 May 2026 22:08:38 +0900 Message-ID: <20260520130840.629934-2-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520130840.629934-1-o-takashi@sakamocchi.jp> References: <20260520130840.629934-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The generation parameter is specific to the auto case of iso resources management, while it is in the common parameter structure. Move the generation member to the structure specific to auto case. Signed-off-by: Takashi Sakamoto --- drivers/firewire/core-cdev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index c166e7617d2a..c669c9e42d34 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -129,7 +129,6 @@ struct descriptor_resource { }; =20 struct iso_resource_params { - int generation; u64 channels; s32 bandwidth; }; @@ -144,6 +143,7 @@ struct iso_resource_auto { ISO_RES_AUTO_REALLOC, ISO_RES_AUTO_DEALLOC, } todo; + int generation; struct iso_resource_params params; struct iso_resource_event *e_alloc, *e_dealloc; }; @@ -1316,7 +1316,6 @@ static int fill_iso_resource_params(struct iso_resour= ce_params *params, request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL) return -EINVAL; =20 - params->generation =3D -1; params->channels =3D request->channels; params->bandwidth =3D request->bandwidth; =20 @@ -1336,8 +1335,8 @@ static void iso_resource_auto_work(struct work_struct= *work) scoped_guard(spinlock_irq, &client->lock) { reset_jiffies =3D client->device->card->reset_jiffies; current_generation =3D client->device->generation; - resource_generation =3D r->params.generation; - r->params.generation =3D current_generation; + resource_generation =3D r->generation; + r->generation =3D current_generation; todo =3D r->todo; } =20 @@ -1495,7 +1494,6 @@ static void iso_resource_once_work(struct work_struct= *work) scoped_guard(spinlock_irq, &client->lock) generation =3D client->device->generation; =20 - r->params.generation =3D generation; bandwidth =3D r->params.bandwidth; =20 fw_iso_resource_manage(client->device->card, generation, r->params.channe= ls, &channel, --=20 2.53.0 From nobody Sun May 24 23:32:08 2026 Received: from fhigh-b4-smtp.messagingengine.com (fhigh-b4-smtp.messagingengine.com [202.12.124.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15D1239658D for ; Wed, 20 May 2026 13:08:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282533; cv=none; b=Rqz6O4jhzcsddhmNDjj7KdoypSZvV30WYtj+3yTilHT8BD/ZFYt3LXLXh7yAKXs7XBAVqgG69oSJurP2xW0zpvqpmjHTGO2aAumj/n/t43w2ZhMKrIEkTN0mV2UfZkjXyU/Og1hsvIMx8taoCcGLA7m0Si2dy78PSBYP34mZ1TU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282533; c=relaxed/simple; bh=6qgtfw0IEsxBPWeksBlATYp6O9UU5932/jTYMtXivBM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=twDW2PnoticzENl1Mx/m4hJ+zPvktJUEBO82F1lVQwvyYHEaMMXMrzVnaz8/pIlfN4cKW6CZpWe+bUPeV+a1o/HVBDue/fkKCC0EOtX5Or8c3acsN3sT7fIqr4sSWZz+JwH5edaP8DBDAJey43Anfj3fnUeZ8aXdZR20BXRqkyQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=bY/1q8y/; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Msq34uUc; arc=none smtp.client-ip=202.12.124.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="bY/1q8y/"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Msq34uUc" Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfhigh.stl.internal (Postfix) with ESMTP id DDF1E7A0151; Wed, 20 May 2026 09:08:48 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Wed, 20 May 2026 09:08:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1779282528; x= 1779368928; bh=rjxL62UTomCrUsF2Dilin+962gsq0c28VKmcFFgLkUg=; b=b Y/1q8y/gDCTE9cuIFVjhnKjeh35czltRfbGIgaT0+aLHxruR+bWk33M/V6p2gQeS hmFvUSpKAf/cKhWDMph3rI9m4TzrK0zOWUJNu2gLZUr4sIAHFHVXlnV9P3BxPiH8 dtW9R7mDkFI85I6YzF51wV/tYxFZyJ2ev0GfhtQJ3LJNNS0XVd9aPPOAUGf2TG0i mgZc7ERV9aQXgtQj1QAKgv9IGWeGSfDf7SbnInphqR94wYb2fp9j391f774KUVL5 kj0BRLxoMeR1RZK4SG7X+FHwMnAXs/5cvA3r1eN+eFNq8D25TqW9qXyx8o0aMooB nZULWDR3A50tbBytzgxmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1779282528; x=1779368928; bh=r jxL62UTomCrUsF2Dilin+962gsq0c28VKmcFFgLkUg=; b=Msq34uUcRdXrb4dXX slt3KNRjD0kU5e2L02hN6Xi8+/vrTZu8R9/5MCY2YjqkUqUV3hyXBp0y5bnQVvXG 6+eOo1wW2KWH3UqdhSuM3Y15ivCmV7ckhbKo4qAH14zpa5oBC9cw+Cb+O0zb8dwU BiPM35wjjGXSNEs8oE9TxU6znY61tVIbhLNEK8BsDLdsQBMrPIxmvNWcJ5K9nJ9C MZAL2VzSV4JnDVbosed4TpBfrb53/r39d1wgsGBABIHtITAmluRCUw8Esthpa2Op g0yXKIsRl8WfncmIhpvNWLU3fry3NIGrXLinLIabktF9R10GU9XFfHby6dK8yDmm VaViw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgddugeegjeduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghkrghs hhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgjeeuvd fguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhisehsrg hkrghmohgttghhihdrjhhppdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhu thdprhgtphhtthhopehlihhnuhigudefleegqdguvghvvghlsehlihhsthhsrdhsohhurh gtvghfohhrghgvrdhnvghtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgv rhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 20 May 2026 09:08:47 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/3] firewire: core: rename member name for channel mask of isoc resource Date: Wed, 20 May 2026 22:08:39 +0900 Message-ID: <20260520130840.629934-3-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520130840.629934-1-o-takashi@sakamocchi.jp> References: <20260520130840.629934-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The iso_resource_params structure has a member for channel mask, while the name of field is easy to misinterpret. Append _mask to the member name. Signed-off-by: Takashi Sakamoto --- drivers/firewire/core-cdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index c669c9e42d34..56c21cabc20c 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -129,7 +129,7 @@ struct descriptor_resource { }; =20 struct iso_resource_params { - u64 channels; + u64 channels_mask; s32 bandwidth; }; =20 @@ -1316,7 +1316,7 @@ static int fill_iso_resource_params(struct iso_resour= ce_params *params, request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL) return -EINVAL; =20 - params->channels =3D request->channels; + params->channels_mask =3D request->channels; params->bandwidth =3D request->bandwidth; =20 return 0; @@ -1360,7 +1360,7 @@ static void iso_resource_auto_work(struct work_struct= *work) =20 bandwidth =3D r->params.bandwidth; =20 - fw_iso_resource_manage(client->device->card, current_generation, r->param= s.channels, + fw_iso_resource_manage(client->device->card, current_generation, r->param= s.channels_mask, &channel, &bandwidth, todo !=3D ISO_RES_AUTO_DEALLOC); =20 if (todo =3D=3D ISO_RES_AUTO_DEALLOC) { @@ -1402,7 +1402,7 @@ static void iso_resource_auto_work(struct work_struct= *work) r->todo =3D ISO_RES_AUTO_REALLOC; =20 if (channel >=3D 0) - r->params.channels =3D 1ULL << channel; + r->params.channels_mask =3D BIT_ULL(channel); =20 e =3D r->e_alloc; r->e_alloc =3D NULL; @@ -1496,7 +1496,7 @@ static void iso_resource_once_work(struct work_struct= *work) =20 bandwidth =3D r->params.bandwidth; =20 - fw_iso_resource_manage(client->device->card, generation, r->params.channe= ls, &channel, + fw_iso_resource_manage(client->device->card, generation, r->params.channe= ls_mask, &channel, &bandwidth, r->todo =3D=3D ISO_RES_ONCE_ALLOC); =20 e->iso_resource.handle =3D UNAVAILABLE_HANDLE; --=20 2.53.0 From nobody Sun May 24 23:32:08 2026 Received: from fout-b8-smtp.messagingengine.com (fout-b8-smtp.messagingengine.com [202.12.124.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A78739A7F5 for ; Wed, 20 May 2026 13:08:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282535; cv=none; b=nutMFKi3kfrajAyH49yDGFFfruPpD1KMaGBlL7uLL4sS1oKHqSIejWR/7gK50Kl7O8u3Wi0Z+LFx0skhbEqpNuk938wbvXgMT9nYb4/joIua4xrMzr1TgTWlWxYhgIYz9MvAHLGiWrM4ZKFTyJa/6APriiKWwdDSCl1ev1zM4ds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282535; c=relaxed/simple; bh=zsZTUqr5k61ysyoOuMUO7/faBY/aWWkmp/MEMJwzaAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OXKxWl35E+VKavwJZKSVBms+hG78bmKqQ2mrrFjO8Hm7b/cTrtK2LYI2HxZi6WFi/OR3CmFlxu0omlPRNbwq8Wmh5z0S7h+5fb/Hp47+RfZgyg6ygdv9lWyX2uD3W0bHJLtiWPknmoxg7k3JsG+uVTlOZx9wwid/wYoqR+lTyik= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=yJZ17Cyi; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=u1Ri1kG2; arc=none smtp.client-ip=202.12.124.151 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="yJZ17Cyi"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="u1Ri1kG2" Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfout.stl.internal (Postfix) with ESMTP id 49A0F1D00155; Wed, 20 May 2026 09:08:50 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Wed, 20 May 2026 09:08:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1779282530; x= 1779368930; bh=rwW8SQDBFIALgcLEwKZ2NL/cvNUx1fIvpUey+ISdpmM=; b=y JZ17CyirrF4zvJfQ0myT3x2czPi0Uke0Jr8q+Ko2e22Vh2Eq+5fd2Mt0spQ/rbvU 9K2gsUW5RnpuLseDEpCRt5fWARxiR9BpHuNPHnSjnbkfppGAq4GUOnvazNXudIfb wA5/WNLBqiGfrABdK0amHqelhkLqh4dMSKs5zcrAElhcNvskGYKAdyj+zBTri4k+ QFgWbklZdmLzXy5VGDMUaqj4GqRhXqWKOydIUcSEFw8WUquIWQUYRgN6nn7+cifM /NdLTebSf81eVwjD1J0KdwhCiV9hs3zeiQ+Ut0rarVZZBs14xnA+dCe2mtHhRg4p 4kxwR3C2xMiId6xIvi/6Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1779282530; x=1779368930; bh=r wW8SQDBFIALgcLEwKZ2NL/cvNUx1fIvpUey+ISdpmM=; b=u1Ri1kG2opQLLuhUn UYK/Bg1yFMJkmBi/qdAUksRLKGv0nMODdN9FVShxtcbzBij/8hRdmoe3Hc1HHi2q vTNRMBMbb/kDpKF4BcSBk/6UZZG8hInWwnu6ArC3QqvobfWU8tMhHkczTF8RoSlR q4PXj9IxeY+g7+Okv/YF7x+i4J46tHdyJTm21G+ZLQWA25LHgmjQ5PliZf5LzRDM wHX9xO06YQpAgrVcFD4L63ezmQL+mtU6M3jD1uHU5hCVHpKpDNodAm2pl0ZypVDY XK5PZkujgUMseZZq/3dNtzky9QMdDhvxaHIkFT+4cUHxKQH5WkufLXw/fTfAQhH/ wUEUg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgddugeegjeduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghkrghs hhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgjeeuvd fguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhisehsrg hkrghmohgttghhihdrjhhppdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhu thdprhgtphhtthhopehlihhnuhigudefleegqdguvghvvghlsehlihhsthhsrdhsohhurh gtvghfohhrghgvrdhnvghtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgv rhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 20 May 2026 09:08:49 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 3/3] firewire: core: cancel using delayed work for iso_resource_once management Date: Wed, 20 May 2026 22:08:40 +0900 Message-ID: <20260520130840.629934-4-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520130840.629934-1-o-takashi@sakamocchi.jp> References: <20260520130840.629934-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no need to use deferrable type of work for iso_resource_once management because the work is queued to run immediately. Signed-off-by: Takashi Sakamoto --- drivers/firewire/core-cdev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 56c21cabc20c..e49d8a58be09 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -150,8 +150,7 @@ struct iso_resource_auto { =20 struct iso_resource_once { struct client *client; - // Schedule work and access todo only with client->lock held. - struct delayed_work work; + struct work_struct work; enum { ISO_RES_ONCE_ALLOC, ISO_RES_ONCE_DEALLOC, @@ -1486,7 +1485,7 @@ static int ioctl_deallocate_iso_resource(struct clien= t *client, =20 static void iso_resource_once_work(struct work_struct *work) { - struct iso_resource_once *r =3D from_work(r, work, work.work); + struct iso_resource_once *r =3D from_work(r, work, work); struct client *client =3D r->client; struct iso_resource_event *e =3D r->event; int generation, channel, bandwidth; @@ -1505,7 +1504,7 @@ static void iso_resource_once_work(struct work_struct= *work) =20 queue_event(client, &e->event, &e->iso_resource, sizeof(e->iso_resource),= NULL, 0); =20 - cancel_delayed_work(&r->work); + cancel_work(&r->work); kfree(r); =20 client_put(client); @@ -1525,7 +1524,7 @@ static int init_iso_resource_once(struct client *clie= nt, if (err < 0) return err; =20 - INIT_DELAYED_WORK(&r->work, iso_resource_once_work); + INIT_WORK(&r->work, iso_resource_once_work); r->client =3D client; r->todo =3D todo; =20 @@ -1539,7 +1538,7 @@ static int init_iso_resource_once(struct client *clie= nt, // Keep the client until work item finishing. client_get(r->client); =20 - queue_delayed_work(fw_workqueue, &no_free_ptr(r)->work, 0); + queue_work(fw_workqueue, &no_free_ptr(r)->work); =20 request->handle =3D UNAVAILABLE_HANDLE; =20 --=20 2.53.0