From patchwork Fri Feb 16 13:02:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 202119 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp500082dyb; Fri, 16 Feb 2024 05:11:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWzdK0tq653P7/SCMALkMtWi7NJ8IEWDQNw0hYFwb1rDqhxhGRn4BzlpZbpm4blCmxiFk7eCSZarnWZHUqv31XfI8Af2Q== X-Google-Smtp-Source: AGHT+IEC1uWo9q3Y2gHmNO95WP5t1lr6kxyS4Vl86SOu9VP5JRCLmJEoTO61GqCKO0tRvTkvizPA X-Received: by 2002:a17:906:ecea:b0:a3c:a6de:aaa5 with SMTP id qt10-20020a170906ecea00b00a3ca6deaaa5mr3007590ejb.8.1708089083431; Fri, 16 Feb 2024 05:11:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708089083; cv=pass; d=google.com; s=arc-20160816; b=W53PaIbgWvrrm8U6prTV0RChENq81czBjeJgqkpkCuVcmuCw7GLw4iR3biognUy3qA BjSv5GnkqxRX1+FoAz6GWRNsedG+48X6M9+2GHg+amuvhvUaxyAhXyz6J287myt8UrtC re/1OFqGDXLll+3q6xEHO0LvSDAJ2Xgw4sBl1jEs7SYoBb71yOe3Z+efprv1B9g/N0oh KLAGS9VkpTgmQ+OPFLOyxNMQ7OdPyRgIHZUg7oYzubwTMKfMuxvRdRDyoKW8PDOhzL1r DpApm+Wq4xPYFsnOMjJ5zYoIms2W8kyckJ58PDPBaW4gaT53ZEzUMscKLHrqaF3hKCeY ix0w== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=NXZgLgtE9Xjv+CBc4xeKIuan+mmqkshKa4xkqbegKNE=; fh=8LLeH2nJcg8A1hsNxr4XyI41/qAw/FQ/tXanLsDdcho=; b=oiukeBtokbX5XteZmb5mpV2/cz8EDyZl+XOTW/Jb2rNqQbVo7NsLZTdAGEsX+pSB4y 2xstXsYV3kP0dc0I/gqMRpnYUQVlaJR0gP+RlhZdzENKv5ZzazkoRSezhqa69HRW8WYS e395VT6gxkLDznC0UbGHnlYjbTHRbSdPBRBp+1kXiQwd7mo0LjDS4EBphOInDkaUqm5K MpF91oADqGCIHHOOuCuJEjmaapENyLowpvthymh//H2RRG2g2XoSz3iDoFfmcOtLTJ4N kt4lvGSDftWmQKPS2kL/PqhbU9+lRSh1zmAhkHakEy5stMC6YFBrtqmAXKUtQ/oZo1U+ wzbQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D5ZnHsJE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-68609-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68609-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id mj14-20020a170906af8e00b00a3d7c93d23esi1622725ejb.822.2024.02.16.05.11.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 05:11:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-68609-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D5ZnHsJE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-68609-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68609-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 am.mirrors.kernel.org (Postfix) with ESMTPS id A3ED61F27479 for ; Fri, 16 Feb 2024 13:02:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1AFC8129A67; Fri, 16 Feb 2024 13:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D5ZnHsJE" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 81F281292DA; Fri, 16 Feb 2024 13:02:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708088536; cv=none; b=MpHxUS4IxL6jhZijkfSoAk7SWTpe3tPBxF/MlKh/FRQuzzWJIttmgKU5hJGEBo2oEYsI/7BPb5FIOzBocGynVmwvCyGMJ1ToP9Gt9QnGoc0bx4eu5S5gpkaTfegOwpjoOVheI/Svz6zsbzXgeGt4vv4Srcjgdxdfwj4EEmcCKFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708088536; c=relaxed/simple; bh=sb3buG/KU+fA4QRtXXNpnvZ40Wej6Dxm15Q7iU/SnQI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=rQQXpxRZvvfAr3wLq4qtIIpQ5dkVE8kPHotw3Lxi1rC3iD3KPLApfQsAykRaiqNy9Y+bk4XHPf+N4FpA8clXk+5Gf+zA/3gMMi3+162rHqs0haJzQXHjwX2XvCCAOiOnOB2vfvhFIX5Wz1tCrwcKkVTYYtG9YJRijWAsinb4p/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D5ZnHsJE; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99AC1C433C7; Fri, 16 Feb 2024 13:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708088535; bh=sb3buG/KU+fA4QRtXXNpnvZ40Wej6Dxm15Q7iU/SnQI=; h=From:To:Cc:Subject:Date:From; b=D5ZnHsJEeYoJJQ6k26htv9rfQcX+9/3LnxIyhnEtTP0XY7HDEDpgY1t+JLTv8gZZ3 SvVaF+yQh7GVAMVuy2qVUvX0mYxFWk4smSeo/tPtjMR5nzn67Dg3IwQ0P3SLcXwVkp 0NB9hYL9amIMwv6PDTCJGYE8dhqrT5s6/gwXv+VWWD3XAdbhoQ7fPMclaVCFfZ+26e mebnJPZHASzXDVkBTMMSkJZ+QJTVDv78mwUtLmGmSr2TeWZOiLd86mS97X1FLWL6QB 85IW0Idmxa7+m/tbtWTzPc6WQjbqmE48UugA/O6XSMKUupVpXEix9EPOtTWJsMbiX4 lH69vqy8Vrv5Q== From: Arnd Bergmann To: Jaroslav Kysela , Takashi Iwai Cc: Arnd Bergmann , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ALSA: avoid 'bool' as variable name Date: Fri, 16 Feb 2024 14:02:04 +0100 Message-Id: <20240216130211.3828455-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 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: 1791061219235191814 X-GMAIL-MSGID: 1791061219235191814 From: Arnd Bergmann In modern C versions, 'bool' is a keyword that cannot be used as a variable name, so change this instance use something else, and change the type to bool instead. Signed-off-by: Arnd Bergmann --- sound/core/seq/oss/seq_oss_device.h | 2 +- sound/core/seq/oss/seq_oss_init.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/core/seq/oss/seq_oss_device.h b/sound/core/seq/oss/seq_oss_device.h index 6c2c4fb9b753..f0e964b19af7 100644 --- a/sound/core/seq/oss/seq_oss_device.h +++ b/sound/core/seq/oss/seq_oss_device.h @@ -163,6 +163,6 @@ snd_seq_oss_fill_addr(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, /* misc. functions for proc interface */ -char *enabled_str(int bool); +char *enabled_str(bool b); #endif /* __SEQ_OSS_DEVICE_H */ diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c index 42d4e7535a82..76bf41c26acd 100644 --- a/sound/core/seq/oss/seq_oss_init.c +++ b/sound/core/seq/oss/seq_oss_init.c @@ -455,9 +455,9 @@ snd_seq_oss_reset(struct seq_oss_devinfo *dp) * misc. functions for proc interface */ char * -enabled_str(int bool) +enabled_str(bool b) { - return bool ? "enabled" : "disabled"; + return b ? "enabled" : "disabled"; } static const char *