Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp236301pxu; Wed, 25 Nov 2020 01:36:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwiciSc90GBYpNRaVmjNYCWauGYnkVhY1WnF7W3W01iZKNO7KAtbAoTNn8YI+z9z/E1Rb// X-Received: by 2002:a17:906:af8b:: with SMTP id mj11mr2435588ejb.170.1606296964745; Wed, 25 Nov 2020 01:36:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606296964; cv=none; d=google.com; s=arc-20160816; b=hCCpMg5Z/7yioUc2iMAsQDfCehWVrUzp+3TZVLgGmRqZOtotzlaQsmo7yFc9dv576j Ld9rxn5sqIjb07lasqybNDpsNZj8eYw34qFNS0eMRb909or2e/evGfreYahzvdg6btWV EEkVAoL76ka6t3j/pTVt4Mi+dxMbtsneHAl7/RU41OpXpN68EfL5flDYKgBqFNQeQFpZ 1BqqmoZTeV9MnKmhdMxRfgrNktznLHVGGxFlkgr9U1TeIDoasvfgrPPBAdmlcUOOTga3 /T/gTOHfJGkEeqRndl+4QD/CzBTCf6CTSt6BNtZXQcM+jyfHwH4Sx86/5bZJkV9rKE4C 7Wzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=MuEr+TN8EO6wywj7sQUs18k5/f5+dJKPqa0SaZnMOQo=; b=wJCqibqmUPjusT3F/CuV/EwKCBBSeH7Yxg4RyNCyPOU0KfRhX+SFEAVBS7s8ynFO8E mHMiieAeDVKYu9lCGIKxs8hGvVYmlqvJZHirvNzQB1vkfcz7za3q0cb7YuDnrPFtbInF jm20reGgjpu1GbaG0rONJmmejFduJhqBnKXBzzPbt6ib9dRmgj0YshiekcmooRQNep1z 0JkCSidzGuSKcmEoOf5T+3aECUOouh0PAaaoD1XvY4PlOYS+BkqjO9L49mWXGOM6iNYx aCwUbDVi8aYH9J/6eVx6w+1rUmREXe6iYSOam+ncqZN5eXwUOg2fud8Cafa842OzDH44 Zlpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l9si882239edi.199.2020.11.25.01.35.41; Wed, 25 Nov 2020 01:36:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727338AbgKYJbR (ORCPT + 99 others); Wed, 25 Nov 2020 04:31:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726422AbgKYJbQ (ORCPT ); Wed, 25 Nov 2020 04:31:16 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E2BAC0613D4 for ; Wed, 25 Nov 2020 01:31:16 -0800 (PST) Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1khr8r-000388-Fn; Wed, 25 Nov 2020 10:31:13 +0100 Received: from ukl by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1khr8q-00074K-QU; Wed, 25 Nov 2020 10:31:13 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Thorsten Scherer , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Pengutronix Kernel Team Subject: [PATCH v3 2/2] siox: Make remove callback return void Date: Wed, 25 Nov 2020 10:31:06 +0100 Message-Id: <20201125093106.240643-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125093106.240643-1-u.kleine-koenig@pengutronix.de> References: <20201125093106.240643-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c5 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver core ignores the return value of the remove callback, so don't give siox drivers the chance to provide a value. All siox drivers only allocate devm-managed resources in .probe, so there is no .remove callback to fix. Signed-off-by: Uwe Kleine-König --- drivers/siox/siox-core.c | 5 ++--- include/linux/siox.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/siox/siox-core.c b/drivers/siox/siox-core.c index b56cdcb52967..1794ff0106bc 100644 --- a/drivers/siox/siox-core.c +++ b/drivers/siox/siox-core.c @@ -525,12 +525,11 @@ static int siox_remove(struct device *dev) struct siox_driver *sdriver = container_of(dev->driver, struct siox_driver, driver); struct siox_device *sdevice = to_siox_device(dev); - int ret = 0; if (sdriver->remove) - ret = sdriver->remove(sdevice); + sdriver->remove(sdevice); - return ret; + return 0; } static void siox_shutdown(struct device *dev) diff --git a/include/linux/siox.h b/include/linux/siox.h index da7225bf1877..6bfbda3f634c 100644 --- a/include/linux/siox.h +++ b/include/linux/siox.h @@ -36,7 +36,7 @@ bool siox_device_connected(struct siox_device *sdevice); struct siox_driver { int (*probe)(struct siox_device *sdevice); - int (*remove)(struct siox_device *sdevice); + void (*remove)(struct siox_device *sdevice); void (*shutdown)(struct siox_device *sdevice); /* -- 2.29.2