Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp658886rdg; Wed, 11 Oct 2023 01:34:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1ld4Gi7MyC6iEyZj12gGk7jmWobQ23KJuxUKPoUKoRr7mnq9S2eGBZkdqiqcB4K4H8wqn X-Received: by 2002:a17:902:a411:b0:1bc:4415:3c1 with SMTP id p17-20020a170902a41100b001bc441503c1mr20895671plq.7.1697013267511; Wed, 11 Oct 2023 01:34:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697013267; cv=none; d=google.com; s=arc-20160816; b=bafXllgB5M1WT9W6DLPQZrY6+nB8jGPhx485wWHIX01wXZPQpP7lb1rHrFEl1xu9XK 3Wtp+W6+BUW4jzw+WySV52J2PcSHZMeJ9TTBvTbeCAYyFFJk0BSibQL4xcTc1T3nZ13c 8rLGApehcjH60MeEVNqlgWjsgW/I0MuqcrfDIRmo9OIc3TaM6VGJVAWYiaOjiscoRGdj c2iMT94WrDwpELBmHCMHz1wdUp92SEzvv/b93/Jz13GljMCi7ME7UIXviFA2mzGUiUL4 gVrrfjLEmeQseGZNFXrwYtY6mJKwPtxdHaIQlgxpI8MWD5NGrZJzmkYaamSeY7AobKI7 ve5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iG6jz8d0tjMJY5+b2+xvdz578Wn8vNP7gIzR4DpceEs=; fh=MhrbsAf/OD/jzMi+qhcDtXfI7dSrE3YknGm+03Jk4PY=; b=nsKiM/7pdMhdT7sAMIm7NsLxzdRjMzZjKJRwFAdGSVe6A23zLhNcR/UPwMqzCFI2vr 2P5nLqg9CVZmYO8J2+XEGp8Qcxgn6HFTZ//B1GLCttm6fDqTO5folaiEhNXiC2etrAxg M0fDxkNPiM1df38zE43vo5JAzzAP3o/NBzB+rqxMRS7JlXE0cHW1QJ2019ewEFsokjOD fUV5X0JVQwTeq7ZJvPgiV7CB1QnGQyl+WFykCkgpC6e/jAYU6K1d5hDh5osb97cxtSjZ nIDf8N5KTBa2rys/CXDWCk3GgyvZ5xEyuDnp3bxRu2HPWEbHjSXgpFbyolGSePiUdl2M dN5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CC3eIXGB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id b12-20020a170902d50c00b001c9ad8ca211si4031857plg.18.2023.10.11.01.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 01:34:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CC3eIXGB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 96D6781B6A8E; Wed, 11 Oct 2023 01:34:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230406AbjJKIeU (ORCPT + 99 others); Wed, 11 Oct 2023 04:34:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbjJKIeI (ORCPT ); Wed, 11 Oct 2023 04:34:08 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E6D49E; Wed, 11 Oct 2023 01:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697013245; x=1728549245; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9GeUK2SGN9OGtW6dMn16QDj8PfFEO9Do3zKwnp3cbpk=; b=CC3eIXGBDVnsQ2a/56YWAEhsevQciyUY/Nw6AUcwDf1XTrQvJ/+pgoO0 2TfTAJWVZ4CVX3JfIvqTh9R5YIaDYXe+Y9Noy7xc4xV0ByzEbx4+rMEuS zoyCnjHP+xi46IVZq49Cv+shdPfXaikOGhgTTG4DN3kPjlpFmlKEHkBRi MJw/k0URAvCaCe/zNSb+B0wXl3+QvOGnasif2BkLxXktnEVNTsTzMsxvv fVGZB5Rr9/wEuHm8IhRAuTxTY8DIKtUFxhyK+tFWLeTYB54/Mu4C9twE1 cuLNDhRXY30vR5IIU4QEIFpdunAF3J3xt/FYwW8Qp5DnKmR7ZE5o+/JLX w==; X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="388480169" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="388480169" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 01:34:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="897548199" X-IronPort-AV: E=Sophos;i="6.03,214,1694761200"; d="scan'208";a="897548199" Received: from powerlab.fi.intel.com ([10.237.71.25]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2023 01:32:16 -0700 From: Michal Wilczynski To: linux-acpi@vger.kernel.org Cc: rafael@kernel.org, dan.j.williams@intel.com, vishal.l.verma@intel.com, lenb@kernel.org, dave.jiang@intel.com, ira.weiny@intel.com, rui.zhang@intel.com, linux-kernel@vger.kernel.org, nvdimm@lists.linux.dev, Michal Wilczynski , Andy Shevchenko Subject: [PATCH v3 2/6] ACPI: AC: Use string_choices API instead of ternary operator Date: Wed, 11 Oct 2023 11:33:30 +0300 Message-ID: <20231011083334.3987477-3-michal.wilczynski@intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011083334.3987477-1-michal.wilczynski@intel.com> References: <20231011083334.3987477-1-michal.wilczynski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 11 Oct 2023 01:34:26 -0700 (PDT) Use modern string_choices API instead of manually determining the output using ternary operator. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: Michal Wilczynski --- drivers/acpi/ac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 83d45c681121..f809f6889b4a 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -243,8 +244,8 @@ static int acpi_ac_add(struct acpi_device *device) goto err_release_ac; } - pr_info("%s [%s] (%s)\n", acpi_device_name(device), - acpi_device_bid(device), ac->state ? "on-line" : "off-line"); + pr_info("%s [%s] (%s-line)\n", acpi_device_name(device), + acpi_device_bid(device), str_on_off(ac->state)); ac->battery_nb.notifier_call = acpi_ac_battery_notify; register_acpi_notifier(&ac->battery_nb); -- 2.41.0