From owner-dev-commits-src-all@freebsd.org Thu Jun 3 17:29:08 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF9A763DCE0; Thu, 3 Jun 2021 17:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FwtDN60LTz3v43; Thu, 3 Jun 2021 17:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B37025E20; Thu, 3 Jun 2021 17:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 153HT8Ov036527; Thu, 3 Jun 2021 17:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 153HT8Ak036526; Thu, 3 Jun 2021 17:29:08 GMT (envelope-from git) Date: Thu, 3 Jun 2021 17:29:08 GMT Message-Id: <202106031729.153HT8Ak036526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ef65f7bdf26e - main - mmc:: Undo my conversion of (bool) to !!. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef65f7bdf26e2f69e13d54e1ffd671de7d9032f6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2021 17:29:08 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef65f7bdf26e2f69e13d54e1ffd671de7d9032f6 commit ef65f7bdf26e2f69e13d54e1ffd671de7d9032f6 Author: Warner Losh AuthorDate: 2021-06-03 17:26:57 +0000 Commit: Warner Losh CommitDate: 2021-06-03 17:29:04 +0000 mmc:: Undo my conversion of (bool) to !!. The need for !! over (bool) pre-dates gcc 4.2, so go with the patch as-submitted because the kernel tends to prefer that. Suggested by: emaste@ Sponsored by: Netflix --- sys/dev/mmc/mmc_fdt_helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c index 9d120fa01a26..175de28ac5fb 100644 --- a/sys/dev/mmc/mmc_fdt_helpers.c +++ b/sys/dev/mmc/mmc_fdt_helpers.c @@ -407,7 +407,7 @@ mmc_fdt_gpio_get_present(struct mmc_fdt_helper *helper) gpio_pin_is_active(helper->cd_pin, &pinstate); - return (pinstate ^ !!(helper->props & MMC_PROP_CD_INVERTED)); + return (pinstate ^ (bool)(helper->props & MMC_PROP_CD_INVERTED)); } bool @@ -423,7 +423,7 @@ mmc_fdt_gpio_get_readonly(struct mmc_fdt_helper *helper) gpio_pin_is_active(helper->wp_pin, &pinstate); - return (pinstate ^ !!(helper->props & MMC_PROP_WP_INVERTED)); + return (pinstate ^ (bool)(helper->props & MMC_PROP_WP_INVERTED)); } void