From patchwork Mon Jul 18 05:05:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12920718 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 38C39C43334 for ; Mon, 18 Jul 2022 05:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=lxvasJ4AedIuqvhAhX4sJac9XUMHQ97BL6sGYa0Z7p0=; b=XJPXfVuB4aumyS eyHiXacfoBxfqtMvJbPoRdKzf6opqhdyqfawjbpQ5T8ofQCOx50HBZYEdhaQzyMzpEoy2kHiz4wrs BY5Z9HThPtjNMFIorLVs5UIKdCI/jumg9kkGf6CiacLKoxpOx/u38J3cO30auHXKWBJWbuixP7e4B v5l5xu8bKPBSDWW7TEgDrI1eFQeaaJgsagl/alloT3c9XT13GXdcQks7Yu12rsJpp85l7gZ2Zyf2x 4h11NKZX7feF0n3ZxSDTfBKin8SB0jdl6H8JFJhodi0q279i18/87Bm9QFBASHlmiYARKYVo1qX0W 2zW20ewbc9QVXm+UHslA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oDIwP-00AyIz-ER; Mon, 18 Jul 2022 05:05:09 +0000 Received: from 089144198117.atnat0007.highway.a1.net ([89.144.198.117] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1oDIwI-00AyGk-Iv; Mon, 18 Jul 2022 05:05:03 +0000 From: Christoph Hellwig To: marcan@marcan.st, sven@svenpeter.dev Cc: alyssa@rosenzweig.io, linux-nvme@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] nvme-apple: stop casting function pointer signatures Date: Mon, 18 Jul 2022 07:05:00 +0200 Message-Id: <20220718050500.227804-1-hch@lst.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Casting function pointers breaks control flow enforcement and is generally a horrible coding style. Add two wrapper to get rid of these casts. Signed-off-by: Christoph Hellwig Reviewed-by: Sven Peter Reviewed-by: Chaitanya Kulkarni Reviewed-by: Hector Martin --- drivers/nvme/host/apple.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c index 7816b5a7d0e1b..3cf607bb9ee6c 100644 --- a/drivers/nvme/host/apple.c +++ b/drivers/nvme/host/apple.c @@ -1220,6 +1220,11 @@ static void apple_nvme_async_probe(void *data, async_cookie_t cookie) nvme_put_ctrl(&anv->ctrl); } +static void devm_apple_nvme_put_tag_set(void *data) +{ + blk_mq_free_tag_set(data); +} + static int apple_nvme_alloc_tagsets(struct apple_nvme *anv) { int ret; @@ -1236,8 +1241,7 @@ static int apple_nvme_alloc_tagsets(struct apple_nvme *anv) ret = blk_mq_alloc_tag_set(&anv->admin_tagset); if (ret) return ret; - ret = devm_add_action_or_reset(anv->dev, - (void (*)(void *))blk_mq_free_tag_set, + ret = devm_add_action_or_reset(anv->dev, devm_apple_nvme_put_tag_set, &anv->admin_tagset); if (ret) return ret; @@ -1261,8 +1265,8 @@ static int apple_nvme_alloc_tagsets(struct apple_nvme *anv) ret = blk_mq_alloc_tag_set(&anv->tagset); if (ret) return ret; - ret = devm_add_action_or_reset( - anv->dev, (void (*)(void *))blk_mq_free_tag_set, &anv->tagset); + ret = devm_add_action_or_reset(anv->dev, devm_apple_nvme_put_tag_set, + &anv->tagset); if (ret) return ret; @@ -1363,6 +1367,11 @@ static int apple_nvme_attach_genpd(struct apple_nvme *anv) return 0; } +static void devm_apple_nvme_mempool_destroy(void *data) +{ + mempool_destroy(data); +} + static int apple_nvme_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1460,8 +1469,8 @@ static int apple_nvme_probe(struct platform_device *pdev) ret = -ENOMEM; goto put_dev; } - ret = devm_add_action_or_reset( - anv->dev, (void (*)(void *))mempool_destroy, anv->iod_mempool); + ret = devm_add_action_or_reset(anv->dev, + devm_apple_nvme_mempool_destroy, anv->iod_mempool); if (ret) goto put_dev;