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 30E72CCA47A for ; Tue, 14 Jun 2022 04:54:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241504AbiFNEyu (ORCPT ); Tue, 14 Jun 2022 00:54:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240551AbiFNEys (ORCPT ); Tue, 14 Jun 2022 00:54:48 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73A7137BD6; Mon, 13 Jun 2022 21:54:47 -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=xVrT4eVcIYRujIwa3JDjYXEZV1LmJHxRXGA2Ss7neX8=; b=sZWhNkQZSA2tufMa8NpcSAzUvE mzv0SxsvkYadS+eSGnAUEf5edN2DYo869XrOWb7FsQ94dkJYX22aoZtIkwAUKkBj8IPH9hw+3TYVv p0owWShjnJYx8ku+CpJE631QyQyhizQbpjwnjaiYucT9XaAkWfopAIe7S8dRpOnYnxdN/warHCSQj KMIYa3Z/MBbbh2+sesgBROc7P+UguObmxQx5D79jeW+lQT/FIxX4n2X+ENusi5ZJFUZKHLKi28uSr Hado4s+Ep7Evv1022J8Hc3x0iJmN2iTM0EBxH7U1RJUCBqzur5yQrCdE2GvUkTa+GjLCCsnDquKpl Oe4JEBlA==; Received: from [2001:4bb8:180:36f6:1fed:6d48:cf16:d13c] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1o0yZf-0072fF-JX; Tue, 14 Jun 2022 04:54:44 +0000 From: Christoph Hellwig To: Kirti Wankhede , Tony Krowiak , Halil Pasic , Jason Herne , Eric Farman , Matthew Rosato , Zhenyu Wang , Zhi Wang , Alex Williamson Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, Jason Gunthorpe , Kevin Tian Subject: [PATCH 05/13] vfio/mdev: remove mdev_from_dev Date: Tue, 14 Jun 2022 06:54:20 +0200 Message-Id: <20220614045428.278494-6-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614045428.278494-1-hch@lst.de> References: <20220614045428.278494-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 --- 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 fe4230b21993d..49a4a26787ce6 100644 --- a/drivers/vfio/mdev/mdev_core.c +++ b/drivers/vfio/mdev/mdev_core.c @@ -54,10 +54,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 d28ddf0f561a0..409e86d343a05 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