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 C0955C433EF for ; Fri, 8 Jul 2022 21:09:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240426AbiGHVJB (ORCPT ); Fri, 8 Jul 2022 17:09:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240346AbiGHVI4 (ORCPT ); Fri, 8 Jul 2022 17:08:56 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B3D27B34F for ; Fri, 8 Jul 2022 14:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657314535; x=1688850535; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aYeqEtB0ol/kEHCAJj+GSoyDW6QM2eAkrk+BT95dSLk=; b=NG5CEipFoPJlUQ0pZD6Rfugmz42KW3HumJHtqTL/UkdPyoQLeoTVDDON Z41e2mh5+yplWWn6xNbr1jionzHeCmu3uGRusovQ5uZ5yIv4BK/Q2EqDs 0OcmeGjq8czwqUJc4vZejtC4zkq1akBFQJzXf6ELkznK4fEfMsnlbW8ZD Q5fzWMc/W58i7bXMSL7ZiekaQEkGLXCf1Q21cQb71at54yNJ0BfKAxVo+ f4sPDHzLjpQ2meL+heXPMXAChrRO/nTtAIXQyxvFvb5gd9HMoaPLvkBTn LHO9vh7a7JRLE+0Gbz7W+NfZ2EJHClQ6X3ENJXwIQ9Px8rAzizq3p8N11 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10402"; a="285494234" X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="285494234" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 14:08:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="569078341" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 08 Jul 2022 14:08:53 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B12A35AD; Sat, 9 Jul 2022 00:09:00 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org Cc: john.garry@huawei.com Subject: [PATCH v2 4/4] bus: hisi_lpc: Don't guard ACPI IDs with ACPI_PTR() Date: Sat, 9 Jul 2022 00:08:59 +0300 Message-Id: <20220708210859.6774-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220708210859.6774-1-andriy.shevchenko@linux.intel.com> References: <20220708210859.6774-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The OF ID table is not guarded, and the ACPI table does not needs it either. The IDs do not depend on the configuration. Hence drop ACPI_PTR() from the code and move ID table closer to its user. Signed-off-by: Andy Shevchenko Acked-by: John Garry Reviewed-by: Rafael J. Wysocki --- v2: added tags (John, Rafael), improved commit message (John) drivers/bus/hisi_lpc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c index a6513a571d7b..74f4448bff9d 100644 --- a/drivers/bus/hisi_lpc.c +++ b/drivers/bus/hisi_lpc.c @@ -589,11 +589,6 @@ static int hisi_lpc_acpi_probe(struct device *hostdev) return ret; } - -static const struct acpi_device_id hisi_lpc_acpi_match[] = { - {"HISI0191"}, - {} -}; #else static int hisi_lpc_acpi_probe(struct device *dev) { @@ -688,11 +683,16 @@ static const struct of_device_id hisi_lpc_of_match[] = { {} }; +static const struct acpi_device_id hisi_lpc_acpi_match[] = { + {"HISI0191"}, + {} +}; + static struct platform_driver hisi_lpc_driver = { .driver = { .name = DRV_NAME, .of_match_table = hisi_lpc_of_match, - .acpi_match_table = ACPI_PTR(hisi_lpc_acpi_match), + .acpi_match_table = hisi_lpc_acpi_match, }, .probe = hisi_lpc_probe, .remove = hisi_lpc_remove, -- 2.35.1