From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39091C43216 for ; Fri, 30 Jul 2021 19:10:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1CD8E60720 for ; Fri, 30 Jul 2021 19:10:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231172AbhG3TLA (ORCPT ); Fri, 30 Jul 2021 15:11:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229773AbhG3TK5 (ORCPT ); Fri, 30 Jul 2021 15:10:57 -0400 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 6F17BC061798 for ; Fri, 30 Jul 2021 12:10:44 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m9Xu6-00068k-Qf; Fri, 30 Jul 2021 21:10:42 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m9Xu6-0005yq-AL; Fri, 30 Jul 2021 21:10:42 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1m9Xu6-0007Kr-9X; Fri, 30 Jul 2021 21:10:42 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de, Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org Subject: [PATCH v2 3/4] zorro: Simplify remove callback Date: Fri, 30 Jul 2021 21:10:34 +0200 Message-Id: <20210730191035.1455248-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210730191035.1455248-1-u.kleine-koenig@pengutronix.de> References: <20210730191035.1455248-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Patch-Hashes: v=1; h=sha256; i=2IHfhYKwbh9XCZ0XszehSQcpjlGMcK+XmwnHD2PqbFY=; m=9UHNse895G/vDh5P0mx6F6/J3P0ggUJrPURLuex7MUI=; p=NMbKzy49SX2G6O5rZrz4ze2ElKxz5AkSixdtDWWVYhQ=; g=6c0f3e7061faf1de64c915bdce3f6298646e583c X-Patch-Sig: m=pgp; i=u.kleine-koenig@pengutronix.de; s=0x0D2511F322BFAB1C1580266BE2DCDD9132669BD6; b=iQEzBAABCgAdFiEEfnIqFpAYrP8+dKQLwfwUeK3K7AkFAmEETqUACgkQwfwUeK3K7AksLgf9F59 oknv1wn9tv4PDk5uIvk63nE8/xaanWZ5d2mqrtSZmaCXnvmHRmvVKfflDyoLrFRVHMQTSyD32NE4w 4mOEfprApL5qe01R1zZsG7cgVZAx+pzsNBiaFOOK8Y6LVK2UzBYci0b+b6IBRnYeo2pzf2VOB/1xZ RbXjEVPeyvSUs8P+c10uexjx5bYOWKIOCYIlSARniePInWR4q48zGNelP7zE65Rfc4+vcqZJ0FVMu JJYQdGxgKPwqT/x8c02fyxah9ylGlEVyVzY26PbVs0POUNxzJv4A774grQyFguLUWsMEi/7MDP9QX cZUzH2esy2Lef6lKtO0vywenomfd4Hw== Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 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 only calls a remove callback when the device was successfully bound (aka probed) before. So dev->driver is never NULL. (And even if it was NULL, to_zorro_driver(NULL) isn't ...) Signed-off-by: Uwe Kleine-König --- drivers/zorro/zorro-driver.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index c18524bb8b2a..ab06c9ce2c78 100644 --- a/drivers/zorro/zorro-driver.c +++ b/drivers/zorro/zorro-driver.c @@ -67,11 +67,9 @@ static void zorro_device_remove(struct device *dev) struct zorro_dev *z = to_zorro_dev(dev); struct zorro_driver *drv = to_zorro_driver(dev->driver); - if (drv) { - if (drv->remove) - drv->remove(z); - z->driver = NULL; - } + if (drv->remove) + drv->remove(z); + z->driver = NULL; } -- 2.30.2