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.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 D308CC433DB for ; Mon, 8 Feb 2021 08:22:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7691764E84 for ; Mon, 8 Feb 2021 08:22:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229839AbhBHIWt (ORCPT ); Mon, 8 Feb 2021 03:22:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:37836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbhBHIWs (ORCPT ); Mon, 8 Feb 2021 03:22:48 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 440D164E83; Mon, 8 Feb 2021 08:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612772524; bh=AHqK70hwRArUPlmaNBqcB/l3xwgWWlC+IUF7sEqQJoo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Euxtba8pgMfQVOo5vvJdqevmIr468+acgFi8a67qB4zqSVCugAzPaXlpN2CM1qcOs k8KiMQXs/GtnGjGeYDZuuJkt2T2slyvHkZpmUyxGoZF4Au2OhQgAz9KNG8uxl1OIGM WSTRUgpyNwvLKVjVdF4n6PaTu9DRYG+HldN9C41A= Date: Mon, 8 Feb 2021 09:22:01 +0100 From: Greg Kroah-Hartman To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Cc: Tomas Winkler , Arnd Bergmann , Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: Re: [PATCH v2 1/2] mei: bus: simplify mei_cl_device_remove() Message-ID: References: <20210208073705.428185-1-uwe@kleine-koenig.org> <20210208073705.428185-2-uwe@kleine-koenig.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210208073705.428185-2-uwe@kleine-koenig.org> Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org On Mon, Feb 08, 2021 at 08:37:04AM +0100, Uwe Kleine-König wrote: > The driver core only calls a bus' remove function when there is actually > a driver and a device. So drop the needless check and assign cldrv earlier. > > (Side note: The check for cldev being non-NULL is broken anyhow, because > to_mei_cl_device() is a wrapper around container_of() for a member that is > not the first one. So cldev only can become NULL if dev is (void *)0xc > (for archs with 32 bit pointers) or (void *)0x18 (for archs with 64 bit > pointers).) > > Signed-off-by: Uwe Kleine-König > --- > drivers/misc/mei/bus.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c > index 2907db260fba..50d617e7467e 100644 > --- a/drivers/misc/mei/bus.c > +++ b/drivers/misc/mei/bus.c > @@ -878,13 +878,9 @@ static int mei_cl_device_probe(struct device *dev) > static int mei_cl_device_remove(struct device *dev) > { > struct mei_cl_device *cldev = to_mei_cl_device(dev); > - struct mei_cl_driver *cldrv; > + struct mei_cl_driver *cldrv = to_mei_cl_driver(dev->driver); > int ret = 0; > > - if (!cldev || !dev->driver) Yes, anyone checking that the results of a container_of() wrapper can be NULL is not checking anything at all :) thanks for the cleanups, I'll go queue them up. greg k-h