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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83059CCA473 for ; Wed, 6 Jul 2022 07:42:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231728AbiGFHmr (ORCPT ); Wed, 6 Jul 2022 03:42:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231720AbiGFHmp (ORCPT ); Wed, 6 Jul 2022 03:42:45 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20F8B22BE8; Wed, 6 Jul 2022 00:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=I0iofj79GlK4ZjKVtTaAGmfcGkld8bbEYYeqbMBSm7Q=; b=PSlDHUTFZinfDjAuOUMc80bGVb aQxp+sPR1RyQ/opjqg4Cs6aJq8cRWR6LcqbTigqsaxc9ML+EDwUdfFlyQCgmZd+EqfSuQOveqZL7X tos0Isi01ZVdAboyxaEAYP1UP+5NIjVUC7AYwPg5h2vCqtJan1KQW9l595i8r04aCnCw0D0lUS/H8 7TvXM0IeQ1tRHW8PXnT655AA+NT+OD0MtYaq53ZUtwiuNuwb9Me1p5Faw8ZHDuca17eaZvRIvuDSE 6OJNCaTF7FpW0qKjJ6Kh3sEQ8cY3H+PnNyN1hRfkbEIRIR8koUWxvKQXJrzPeeyoIBEcc1mbePAkV KXHc1l/Q==; Received: from [2001:4bb8:189:3c4a:34cd:2d1d:8766:aad] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8zgE-0079o4-W5; Wed, 06 Jul 2022 07:42:41 +0000 From: Christoph Hellwig To: Kirti Wankhede , Tony Krowiak , Halil Pasic , Jason Herne , Eric Farman , Matthew Rosato , Zhenyu Wang , Zhi Wang , Alex Williamson Cc: Jason Gunthorpe , kvm@vger.kernel.org, linux-s390@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, Kevin Tian Subject: [PATCH 06/15] vfio/mdev: remove mdev_from_dev Date: Wed, 6 Jul 2022 09:42:10 +0200 Message-Id: <20220706074219.3614-7-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220706074219.3614-1-hch@lst.de> References: <20220706074219.3614-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org Just open code it in the only caller. Signed-off-by: Christoph Hellwig Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian Reviewed By: Kirti Wankhede --- drivers/vfio/mdev/mdev_core.c | 6 ++---- include/linux/mdev.h | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c index 2d95a497fd3b2..bde7ce620dae0 100644 --- a/drivers/vfio/mdev/mdev_core.c +++ b/drivers/vfio/mdev/mdev_core.c @@ -53,10 +53,8 @@ static void mdev_device_remove_common(struct mdev_device *mdev) static int mdev_device_remove_cb(struct device *dev, void *data) { - struct mdev_device *mdev = mdev_from_dev(dev); - - if (mdev) - mdev_device_remove_common(mdev); + if (dev->bus == &mdev_bus_type) + mdev_device_remove_common(to_mdev_device(dev)); return 0; } diff --git a/include/linux/mdev.h b/include/linux/mdev.h index cc70cc1e25d91..411b655c36ab2 100644 --- a/include/linux/mdev.h +++ b/include/linux/mdev.h @@ -107,9 +107,5 @@ static inline struct device *mdev_dev(struct mdev_device *mdev) { return &mdev->dev; } -static inline struct mdev_device *mdev_from_dev(struct device *dev) -{ - return dev->bus == &mdev_bus_type ? to_mdev_device(dev) : NULL; -} #endif /* MDEV_H */ -- 2.30.2