From patchwork Fri Feb 23 19:49:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 205692 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp846757dyb; Fri, 23 Feb 2024 13:10:32 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWf6hDOEMPwg7SU+Snu0fniqZQxBx7bWfdMQIOoIW/5ng2836rLUUfuRjrGjEzI59+BspmHWwYHfEy8GwsC4gTs13Mp6Q== X-Google-Smtp-Source: AGHT+IGK3MOXWVN1N1+6ImcQ2SsBzcpdTb30lR1FO8rw73QzR/YhcQH+JOLua4DNxWJ35L/E15MW X-Received: by 2002:a05:622a:1753:b0:42e:616e:e15f with SMTP id l19-20020a05622a175300b0042e616ee15fmr393672qtk.0.1708722631967; Fri, 23 Feb 2024 13:10:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708722631; cv=pass; d=google.com; s=arc-20160816; b=pTl9j2D1OgQI9jT68Q9Kq/yO8l7Y2Vt33VhtkZVqoFeRW3b/PiPEWKtAKHrQa73IYw IEWUt9RJ73bE6WQXUsaX9rnLrH8wSFMRO5IWOrjIdvlt6lX1SPpCSg+ozxTL4zzHlz7O rJ/ofAFP/ObgYCdQG2WeNeR32THVeAEwzg52w4la4uqtsIgKzVvrLoLtXWJQlPuvBxJ3 x40TgQqQE/U8E4RlwCh5XGCixN0K8uPYvij5PMUgVkLc/FixDiHoSV1VOWOQdj05WKO9 HwsWjQ7e4AVjVAn7QD9y0LHdf+Ujv/IudKJ5xfNF8NzjlS92k5DlLHoaWwmk3OgnWAA2 LvPg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=8OIwTJrVltC3Ef9A3y2aYXgTLh66b7IgUt2PBfwRyBI=; fh=NrWLvEVUW8ufGou/ZOuWZl9yKC+ByU+oxgRUdXMV2yI=; b=U/xuLV0T5NliX+G5vCBSsxlOIFftvXvKZEF1YCs7YUHfYaKcNIhcZUnIohIk1CmQ9x YWOCbdfrux+NvZ3d8MWloY0wr6ss18/kXrQOeoWWlwZi2l4C1xkDkcT9pGbc4MjY1aFB QpaXsYUA1uSudBeNyQzObLhOwCImq8Nc9RLNSJyaqivtzLnMlClmN6dwmtPh1vstnBLc VO5ABap1y7ss/1XaM+fm5hx9NOxrvx4ZJHYTod+LuYx3H6eqDAAcs64azwozPngtfMbC Q6TDZSAXtOd7XOn98jAHgOma96zfT8MBdiSaEV73e3hfQb7qptfEOaL9GqfReWy6W+xk n5Fw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=h0wh6rG4; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-79061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79061-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id o13-20020ac841cd000000b0042e2a84ec96si8052451qtm.99.2024.02.23.13.10.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 13:10:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=h0wh6rG4; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-79061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79061-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 18E9E1C24772 for ; Fri, 23 Feb 2024 19:53:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 15D9D14CAC0; Fri, 23 Feb 2024 19:51:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="h0wh6rG4" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B29AD149393 for ; Fri, 23 Feb 2024 19:51:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708717881; cv=none; b=axnxPaQPsceBfhJAccecNWUg0aOgc3T5l7PwkzrLUDnza3zifMER16DEKHP7tSFY9mjThFXjh0cqpISvVAe/zEH86cx7PPvv0U+Hhtop7YZXL6abXlrncuOa95/oefCxc7p73r26OrmXQhlxfzMRDm96UmmRy2Bpc65jAtL7X5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708717881; c=relaxed/simple; bh=Wj2D0oBH1J9oTB67/0tbEOo9q7DzAHlzlDkwpbhKu14=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GZzirf40fbOu8kM4u0oK52RLZQxbDa4Tjpe2V2kI/s9FVwYPPkHqS0ux6/1xVxexS7y1DJZdB0j5XzXXRCu4TE+wLef9JBsW1kmAWyMtjaawGcmd0jF2aQgcrHgs6ybpuEvq5TxPFjSdb4qlL/ImZt2r2j324smwdU+X1ulvm8o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=h0wh6rG4; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708717880; x=1740253880; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Wj2D0oBH1J9oTB67/0tbEOo9q7DzAHlzlDkwpbhKu14=; b=h0wh6rG4xI7UdJN6Yq86nPJN+fhEvIoJ7IpAY531V97qvdwdYmccJER5 +2h313nLl3jR1DN8E85cYS9fdeRvOaVWCliArOQObZicEF5J9jL7KQyZl 3mbouiNhjMAM7yPDl/nRND2BBtmHHrUAwAhxssnJuuUMnKdjyiJd9ByeA lLhM1GXjlPji3n33ENctX7RJJ+nx8Uw+ke84CyUVMSuYuuwLmx/Gyfe3i rC7oSHX6mJv3S9d7swQlb1zlS0qij7nzKvA2reJ5LmTZzUYj2AeYOpQPs PYwCjBnDcL3h0m+UNsa8YvDDTn4b4MyMtKv3PIq61QAeJMZIThUGjUDKD A==; X-IronPort-AV: E=McAfee;i="6600,9927,10993"; a="6837326" X-IronPort-AV: E=Sophos;i="6.06,180,1705392000"; d="scan'208";a="6837326" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2024 11:51:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10993"; a="937025652" X-IronPort-AV: E=Sophos;i="6.06,180,1705392000"; d="scan'208";a="937025652" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 23 Feb 2024 11:51:15 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 96B134A5; Fri, 23 Feb 2024 21:51:14 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Lee Jones Subject: [PATCH v1 1/6] mfd: kempld: Replace ACPI code with agnostic one Date: Fri, 23 Feb 2024 21:49:50 +0200 Message-ID: <20240223195113.880121-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240223195113.880121-1-andriy.shevchenko@linux.intel.com> References: <20240223195113.880121-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791725542560974319 X-GMAIL-MSGID: 1791725542560974319 There is no need to include and use entire ACPI stack in the driver. Replace respective pieces by agnostic code. No functional change indented. Signed-off-by: Andy Shevchenko --- drivers/mfd/kempld-core.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c index 5557f023a173..99c8656e723c 100644 --- a/drivers/mfd/kempld-core.c +++ b/drivers/mfd/kempld-core.c @@ -9,11 +9,12 @@ #include #include #include +#include #include +#include #include #include #include -#include #define MAX_ID_LEN 4 static char force_device_id[MAX_ID_LEN + 1] = ""; @@ -425,26 +426,6 @@ static int kempld_detect_device(struct kempld_device_data *pld) return ret; } -#ifdef CONFIG_ACPI -static int kempld_get_acpi_data(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - const struct kempld_platform_data *pdata; - int ret; - - pdata = acpi_device_get_match_data(dev); - ret = platform_device_add_data(pdev, pdata, - sizeof(struct kempld_platform_data)); - - return ret; -} -#else -static int kempld_get_acpi_data(struct platform_device *pdev) -{ - return -ENODEV; -} -#endif /* CONFIG_ACPI */ - static int kempld_probe(struct platform_device *pdev) { const struct kempld_platform_data *pdata; @@ -458,10 +439,16 @@ static int kempld_probe(struct platform_device *pdev) * No kempld_pdev device has been registered in kempld_init, * so we seem to be probing an ACPI platform device. */ - ret = kempld_get_acpi_data(pdev); + pdata = device_get_match_data(dev); + if (!pdata) + return -ENODEV; + + ret = platform_device_add_data(pdev, pdata, sizeof(*pdata)); if (ret) return ret; - } else if (kempld_pdev != pdev) { + } else if (kempld_pdev == pdev) { + pdata = dev_get_platdata(dev); + } else { /* * The platform device we are probing is not the one we * registered in kempld_init using the DMI table, so this one @@ -472,7 +459,6 @@ static int kempld_probe(struct platform_device *pdev) dev_notice(dev, "platform device exists - not using ACPI\n"); return -ENODEV; } - pdata = dev_get_platdata(dev); pld = devm_kzalloc(dev, sizeof(*pld), GFP_KERNEL); if (!pld) @@ -509,19 +495,17 @@ static void kempld_remove(struct platform_device *pdev) pdata->release_hardware_mutex(pld); } -#ifdef CONFIG_ACPI static const struct acpi_device_id kempld_acpi_table[] = { { "KEM0000", (kernel_ulong_t)&kempld_platform_data_generic }, { "KEM0001", (kernel_ulong_t)&kempld_platform_data_generic }, {} }; MODULE_DEVICE_TABLE(acpi, kempld_acpi_table); -#endif static struct platform_driver kempld_driver = { .driver = { .name = "kempld", - .acpi_match_table = ACPI_PTR(kempld_acpi_table), + .acpi_match_table = kempld_acpi_table, }, .probe = kempld_probe, .remove_new = kempld_remove,