From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 576723B777D for ; Wed, 25 Mar 2026 10:32:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774434740; cv=none; b=A1qib02PpkvOZkm5YjzPE9m/aBGchAv7INhdq5Qkqhz68LxVW/MeOGPHhBstOvTFd4oz+8MM8cw1ZrMW5mg2TnnNh3cnaMyVZ2eKbNANdthdWlEvPJgxvVKhxm5GWZStUch4lOc+8qZVC2TjYm8f33QWFtidWusdZHvsAKfXBiY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774434740; c=relaxed/simple; bh=zkEg0QwOx8k9wvd3mIwgtB+aoC9QwKnHw0HfEeqqT/8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=i1qpL9SUoGwZ+9ZJpCk19AYhKj+tdM4pCHxtKuzWCnn2kYy7UkJuh+mcUCb1BxuqkANL7etVjZByrbcZ95Bn3sX1Vu9o7p4e4tiQ4GjB77Vrd3DS/bg8guFlWFD0lSir5AWjyvOtXnArHXMn3b6A5k/I/pMGQ3xlOspUXWUiFQ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=aKbZ11N5; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=aKbZ11N5; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="aKbZ11N5"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="aKbZ11N5" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 8067C5BCE8; Wed, 25 Mar 2026 10:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1774434737; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=iJcWlrvV1kAWao0L5xVsbewfuCSEeElj31m1StDD3cI=; b=aKbZ11N57+yJi1oxJCo6AWmSHZ6vRyT2T/py+/9EDLBAhXDXp5HzFXxnJhvDTghIG/5o7H kK/SNUmEESr4plE8Oa9qBVuccM0PbWULZF9HaVV070lIwLNo8cA/gDgcoGQR+Zs9G/IZf8 jfA7BlCFrtgwqrU1pFRuCaGcLv7jzP4= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1774434737; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=iJcWlrvV1kAWao0L5xVsbewfuCSEeElj31m1StDD3cI=; b=aKbZ11N57+yJi1oxJCo6AWmSHZ6vRyT2T/py+/9EDLBAhXDXp5HzFXxnJhvDTghIG/5o7H kK/SNUmEESr4plE8Oa9qBVuccM0PbWULZF9HaVV070lIwLNo8cA/gDgcoGQR+Zs9G/IZf8 jfA7BlCFrtgwqrU1pFRuCaGcLv7jzP4= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6B4A74435B; Wed, 25 Mar 2026 10:32:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id JMsgGbG5w2nVUAAAD6G6ig (envelope-from ); Wed, 25 Mar 2026 10:32:17 +0000 From: Oliver Neukum To: linux-usb@vger.kernel.org Cc: Oliver Neukum Subject: [RFC 1/2] hid: usbhid: call usb_queue_reset_device directly Date: Wed, 25 Mar 2026 11:31:48 +0100 Message-ID: <20260325103210.198820-1-oneukum@suse.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; URIBL_BLOCKED(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:mid,suse.com:email]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:mid,suse.com:email]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO There is no point in scheduling a work to schedule another work. Just schedule it directly. Signed-off-by: Oliver Neukum --- drivers/hid/usbhid/hid-core.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index fd3e1aedc5cb..a70721b3add6 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -132,13 +132,9 @@ static void hid_reset(struct work_struct *work) dev_dbg(&usbhid->intf->dev, "clear-halt failed: %d\n", rc); set_bit(HID_RESET_PENDING, &usbhid->iofl); + usb_queue_reset_device(usbhid->intf); } } - - if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) { - dev_dbg(&usbhid->intf->dev, "resetting device\n"); - usb_queue_reset_device(usbhid->intf); - } } /* Main I/O error handler */ @@ -171,7 +167,7 @@ static void hid_io_error(struct hid_device *hid) if (!test_bit(HID_NO_BANDWIDTH, &usbhid->iofl) && !test_and_set_bit(HID_RESET_PENDING, &usbhid->iofl)) { - schedule_work(&usbhid->reset_work); + usb_queue_reset_device(usbhid->intf); goto done; } } @@ -1496,18 +1492,18 @@ static void hid_restart_io(struct hid_device *hid) { struct usbhid_device *usbhid = hid->driver_data; int clear_halt = test_bit(HID_CLEAR_HALT, &usbhid->iofl); - int reset_pending = test_bit(HID_RESET_PENDING, &usbhid->iofl); spin_lock_irq(&usbhid->lock); clear_bit(HID_SUSPENDED, &usbhid->iofl); usbhid_mark_busy(usbhid); - if (clear_halt || reset_pending) + if (clear_halt) schedule_work(&usbhid->reset_work); + usbhid->retry_delay = 0; spin_unlock_irq(&usbhid->lock); - if (reset_pending || !test_bit(HID_STARTED, &usbhid->iofl)) + if (!test_bit(HID_STARTED, &usbhid->iofl)) return; if (!clear_halt) { -- 2.53.0