Received-SPF: pass (google.com: domain of linux-crypto+bounces-3302-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <dd7977b9-bdd2-f36f-36bd-a383a2588f6e@amd.com>
Date: Wed, 3 Apr 2024 10:17:51 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Content-Language: en-US
To: Arnd Bergmann <arnd@kernel.org>, linux-kernel@vger.kernel.org,
 John Allen <john.allen@amd.com>, Herbert Xu <herbert@gondor.apana.org.au>,
 "David S. Miller" <davem@davemloft.net>
Cc: Arnd Bergmann <arnd@arndb.de>,
 =?UTF-8?Q?Uwe_Kleine-K=c3=b6nig?= <u.kleine-koenig@pengutronix.de>,
 linux-crypto@vger.kernel.org
References: <20240403080702.3509288-1-arnd@kernel.org>
 <20240403080702.3509288-25-arnd@kernel.org>
From: Tom Lendacky <thomas.lendacky@amd.com>
Subject: Re: [PATCH 24/34] crypto: ccp - drop platform ifdef checks
In-Reply-To: <20240403080702.3509288-25-arnd@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?bk0zcjBNSnN5djh5Mkptb04ycGo0Z2RRcUhlL3haRVdxYTFrREdsMG4vNWlN?=
 =?utf-8?B?RFRKMmwxNXpZb0svSHZlYTY4QTI1NktSUnM5SHd6aFdzSE5hSDFOZXdGNzl0?=
 =?utf-8?B?V043cjRpZGV2emVGdElzTUtKUlE1OERqRXA0eFh1OVBHSVE0eElheTRaRnpr?=
 =?utf-8?B?Wk9iYXBsWFZQK3dzdmtReHNvbjFZZFYyOC9zOUVuL29oeGJSa3pxU0Ixck5Y?=
 =?utf-8?B?WE1EY2V1dFZhOFliNkU2SXV3elJOS2dWZWpIUVZQU3h0T2hsWDlPc1EwK3hs?=
 =?utf-8?B?OTRweUhDa2I0WTh6MEZSVTF6cUtTMXlNeXJZNGJZMnM5dzAxM2VJQXRER2RO?=
 =?utf-8?B?cUE5ZjZLRHZUano1NS8wRHNpVHhOL2tFbGJEc3VTMjF4a2hUMzlLM0UzMFpG?=
 =?utf-8?B?NjVqbUNKSCtUOGtSR2NYNnBqT3VxZi80YWt5d3hxKzMweDBwNW96N1FJWjJj?=
 =?utf-8?B?Y2EzOG5rZjU1QjZoZndnSVJyTjlOOHNTMGsrRmtmUExMY3ZpaU81elhyaWJR?=
 =?utf-8?B?M2x1TG9hcTNzM2tnTWJYcHRjeDQybmNScUszNnoveHZnK1RERGFqSEVjWHhF?=
 =?utf-8?B?NHZiV1lvVFFZNldmOENIaktMS291ZDh2WjFsUGZBZnZWZTBRWjFLN0xkOVk2?=
 =?utf-8?B?UEp1eGd4QUdlR2RjYytQN2JPYlJkYy82SmVUMzlwRUQ1Yis5clpEV1VHVHlO?=
 =?utf-8?B?cS9pTU9heDF3aHR2K0dJcUp6WlFsa0g2VW5ZVUNoOCtuSzREZytEU3ZXS0lk?=
 =?utf-8?B?NWpPci9PMFVEYjlva09uMWZmSGZ5SjFOM1BBbjcxcGZDeHc1b3BOZ1ZsOFlw?=
 =?utf-8?B?djJmOWxPTGhoWU4xMzBQaCtleFNwTlBYRy81NDJYdjBUZGJDZ3JSc1cyRGpz?=
 =?utf-8?B?ak5VMnFWYUpXWk5WRTdlY0luNEdPK0Q3NS9IKzA3VlBzcVU2NDdKcW1pYmph?=
 =?utf-8?B?K3hqMjVxVkowNFVZeUZJY2pKWURpcmYrOWFkZmczYVlpYXE2OWR0cW5YcGRr?=
 =?utf-8?B?djdRQlJqUHRNQjM5cHVGcjJueTlaQkdPWTdyeldHV3R4NTZzZS82TmZhZU8v?=
 =?utf-8?B?RGpvaWh4UEkrOFNMdXUxOEVrVjRIZ1pwQThJdkh1STdCUFRNU0piMWFPeTVt?=
 =?utf-8?B?M0F2UWN6UFZwVHE4Smlka1ltdkVLUjFVRjRIeU44bUNPT050bmp4anF2djVC?=
 =?utf-8?B?ZjAwUnJFWkw1MXN0NE1SNnBSM3VncGFWbEg2bkxaMVE1bFVIYi9rdUpheEtG?=
 =?utf-8?B?T1VxaFNHWUhPRHZOUlNJdUFDZnFjQmlhVU04c0UvcWwySXBERWQ3MzI5b0Y4?=
 =?utf-8?B?NjFTRFNKUzJOTXpCTlVPMlhWSXhXZHdYYUV0VlZTYVB5alcydVVMZVdOKzhP?=
 =?utf-8?B?WUNoc1hNZkhyR0ZXSmJEMDZTQ3VUY0xoVlJOSXhkTDlLTEY1dzNpMGhMWWY2?=
 =?utf-8?B?N3VjS3RtZGI3RE80SElYOEFsdDgrUktQdUxsK2VVMlRCcjQ5YkR1WWE5RjdD?=
 =?utf-8?B?OGsyZUdFWjdaMENOVkVUTkVnZ2p0UFEyN1dOdmZTak4xRXhTa2JzM0lZaXNi?=
 =?utf-8?B?cTA3eG92d0FoMnZqS1IxdGhYTkp2dldVdnRmcEtZN0JQeERybm9pZ1JSdkJ1?=
 =?utf-8?B?MGM5UHl6S1dRaHlxUzRVeVdmWlI2UnB2clJScFFzUGdrdG9jRGxDZ25hWDIx?=
 =?utf-8?B?eFBqUFRwU0pJV2YxQysyeXJ5ZERSWmNGMEdOd3h5RHdpeHhjZ0lyUG5Oa0c1?=
 =?utf-8?B?VklmeWhxQTdmZFliY2VKOUd6dzVST1NlaDBSbFJPdHQyVXBrb2FvdnU0VmRp?=
 =?utf-8?B?dEtGRWdXQzJWTUpEeU9senptQ3dkM2FOb1oxRXp6RGs3Y3FWMThOTWZtUlpT?=
 =?utf-8?B?K3FmbzRTWENhMkx2ekFJakNvdzUway9za01ENy9ub3lBaktRdEdsaWpZK21M?=
 =?utf-8?B?NCtEcEV2bmprQ2ZRQlZxMGVkc0F4Tkh4OG5TVkVGSTNjbUV2WnEwK2laOGc3?=
 =?utf-8?B?OHkzSUl5K0JpY1JOL1hrTXZNbm5hajV2blF2K1p4QzU3WWF3UzkrZFcrQnhM?=
 =?utf-8?B?WGd3SHBtdDczWHZrQWxRdWNsS2x3Wm1BTE4wRjJuRGNZbXhkZXR0RldBNVN4?=
 =?utf-8?Q?QiS+Uv2hrRAPLzh/9WQnYN4zz?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a7b9b96a-20b3-47ff-0263-08dc53f13bd3
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2024 15:17:53.6913
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: kGlPtVhVtcu05/dXb/kuXtvwTsArEV4/ODqS+CXtvukNeWyrJ8ygqgjM/zlt0qkUL5fqk6y+IvhhguyllhS+SQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4247

On 4/3/24 03:06, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> When both ACPI and OF are disabled, the dev_vdata variable is unused:
> 
> drivers/crypto/ccp/sp-platform.c:33:34: error: unused variable 'dev_vdata' [-Werror,-Wunused-const-variable]
> 
> This is not a useful configuration, and there is not much point in saving
> a few bytes when only one of the two is enabled, so just remove all
> these ifdef checks and rely on of_match_node() and acpi_match_device()
> returning NULL when these subsystems are disabled.
> 
> Fixes: 6c5063434098 ("crypto: ccp - Add ACPI support")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Would using __maybe_unused on dev_vdata be the safer, easier choice?

Either way, I don't think removing the #ifdefs will pose a problem, so:

Acked-by: Tom Lendacky <thomas.lendacky@amd.com>

> ---
>   drivers/crypto/ccp/sp-platform.c | 14 ++------------
>   1 file changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/crypto/ccp/sp-platform.c b/drivers/crypto/ccp/sp-platform.c
> index 473301237760..ff6ceb4feee0 100644
> --- a/drivers/crypto/ccp/sp-platform.c
> +++ b/drivers/crypto/ccp/sp-platform.c
> @@ -39,44 +39,38 @@ static const struct sp_dev_vdata dev_vdata[] = {
>   	},
>   };
>   
> -#ifdef CONFIG_ACPI
>   static const struct acpi_device_id sp_acpi_match[] = {
>   	{ "AMDI0C00", (kernel_ulong_t)&dev_vdata[0] },
>   	{ },
>   };
>   MODULE_DEVICE_TABLE(acpi, sp_acpi_match);
> -#endif
>   
> -#ifdef CONFIG_OF
>   static const struct of_device_id sp_of_match[] = {
>   	{ .compatible = "amd,ccp-seattle-v1a",
>   	  .data = (const void *)&dev_vdata[0] },
>   	{ },
>   };
>   MODULE_DEVICE_TABLE(of, sp_of_match);
> -#endif
>   
>   static struct sp_dev_vdata *sp_get_of_version(struct platform_device *pdev)
>   {
> -#ifdef CONFIG_OF
>   	const struct of_device_id *match;
>   
>   	match = of_match_node(sp_of_match, pdev->dev.of_node);
>   	if (match && match->data)
>   		return (struct sp_dev_vdata *)match->data;
> -#endif
> +
>   	return NULL;
>   }
>   
>   static struct sp_dev_vdata *sp_get_acpi_version(struct platform_device *pdev)
>   {
> -#ifdef CONFIG_ACPI
>   	const struct acpi_device_id *match;
>   
>   	match = acpi_match_device(sp_acpi_match, &pdev->dev);
>   	if (match && match->driver_data)
>   		return (struct sp_dev_vdata *)match->driver_data;
> -#endif
> +
>   	return NULL;
>   }
>   
> @@ -212,12 +206,8 @@ static int sp_platform_resume(struct platform_device *pdev)
>   static struct platform_driver sp_platform_driver = {
>   	.driver = {
>   		.name = "ccp",
> -#ifdef CONFIG_ACPI
>   		.acpi_match_table = sp_acpi_match,
> -#endif
> -#ifdef CONFIG_OF
>   		.of_match_table = sp_of_match,
> -#endif
>   	},
>   	.probe = sp_platform_probe,
>   	.remove_new = sp_platform_remove,