Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Dmytro Bagrii <dimich.dmb@gmail.com>
To:     gregkh@linuxfoundation.org
Cc:     linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
        Dmytro Bagrii <dimich.dmb@gmail.com>
Subject: [PATCH] usb: core: Call disconnect() only if it is provided by driver
Date:   Thu, 19 May 2022 16:29:00 +0300
Message-Id: <20220519132900.4392-1-dimich.dmb@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

A driver may use devres allocations. Disconnect handler is not needed in
this case. Allow such driver to leave .disconnect field uninitialized in
struct usb_driver instead of providing empty stub function.

Signed-off-by: Dmytro Bagrii <dimich.dmb@gmail.com>
---
 drivers/usb/core/driver.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 355ed33a2179..d7fe440b033c 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -455,7 +455,8 @@ static int usb_unbind_interface(struct device *dev)
 	if (!driver->soft_unbind || udev->state == USB_STATE_NOTATTACHED)
 		usb_disable_interface(udev, intf, false);
 
-	driver->disconnect(intf);
+	if (driver->disconnect)
+		driver->disconnect(intf);
 
 	/* Free streams */
 	for (i = 0, j = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) {
-- 
2.36.1