From patchwork Thu Aug 3 13:19:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 130603 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1153235vqx; Thu, 3 Aug 2023 06:36:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlEYzoOeONmIytwLq7gwO4+RXe8HfIjlPFYSWc5Wus93CarDv9ncNX1c8GiU3f7EM76sOIyy X-Received: by 2002:aa7:d58b:0:b0:522:50b9:a177 with SMTP id r11-20020aa7d58b000000b0052250b9a177mr7876352edq.39.1691069792828; Thu, 03 Aug 2023 06:36:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691069792; cv=none; d=google.com; s=arc-20160816; b=rRGwKQJPfC2PSeBtJfCkHvCMkuD9mLumiLmzyAQdTFHGfEXwLxOCBLx1PE28Dtj7Io wkFlFj7jhBRXbHRQBCmEEZytBbmtXk2u8CdU6di7DHaFRFkuPDK0M3+s/noljYK5KgWh XKR1JohozGNYR8Hlv+Vr+wa5D/BSsfjDPTb8QwqFOXQq5xhW6IakY/vAkDj35ROwJAQm Nd5hih2GkkT7lzNQEmombV3vtNbDBjWouBPPiQmdj22m5Fr4HmK0Gx+Y0tt61LVhWlfE 4ljAuQEKUtNlhP1LrNzb5vZT0IXlq5hF3EwwpCNAqcVPxJYRGlAJBMXQHNe6+LH8ERzH /55w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=1U6FYbGhgiplKHTmEXX2/vg1QGF1BJT5qYyqbQNsZ94=; fh=y8wWCKJ2O48BUqB4bOaXf+uGmP7piadGaNiuJORu8C4=; b=oq05nJwWLp23HjiPK4iTiHVmaTbj6MFfII3pZW1EvuPJahPjCr7vvk91Sysb1Xz38F DN+cg7KrwQWRuc6WEilec3U01LEfR22GUYs6CQx8sgMv/4o9O4je1QnHEC+/8Dtfz6Iz q57P6OrzOiE0f6W5vADr8YWsLsCasBDh3ALBMvdRXsArQdMVozQhF7pzas+eGLmNQUU6 GVsK9EzkZvezweyXf8FwrYilfn91wge1NgRJO22u0e1AKV92dBqcUbLAOH26VnQQe7Uu C2j5jPnAncYQxjAyLxvEHzzHSLXuhMfvXUhqs+jbt15IglWFPFW3SHs3Z56VMbHWzdeL Wi+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Y1OFQwJ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g3-20020a056402180300b0052257789cbfsi7730869edy.235.2023.08.03.06.36.08; Thu, 03 Aug 2023 06:36:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Y1OFQwJ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235921AbjHCNa5 (ORCPT + 99 others); Thu, 3 Aug 2023 09:30:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235045AbjHCNah (ORCPT ); Thu, 3 Aug 2023 09:30:37 -0400 Received: from mgamail.intel.com (unknown [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 027EA134; Thu, 3 Aug 2023 06:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691069362; x=1722605362; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=W1vGWvXnwAY/f51FTl0188tECkxF+EFRNzlkxGetUxc=; b=Y1OFQwJ5+Uch8dR/f4uFver+ZmiPwJA4Mu4hVyPr8LxCSHhQ+fKWn86+ JoqLN1HO2nT9u3Z99E2tfBgstS9kMHD57h5kOyIaBmkkDLl0bxyKgJSja O4o2lcXKlv89wkDSjxdeQZusI5tyrD4zbOkQ7l00XvdMRUaanAR/JOPtZ 8wV/U225bfZgs/ErZKaotCJfSmRVMqXIzSPv1ruaX27yLcj2Z1Ea3nnIZ IGxhTj8UIlkCVZAbcYTYSicVhXRNynQSZ+LufzIQYt43a8cFOMiYWb8J8 dx7x8dA/vZq6uz0GHHP3/WMv4VtuifqO6dgICvMiJ8OSr5ZVZSA3sC0Du Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="373499604" X-IronPort-AV: E=Sophos;i="6.01,252,1684825200"; d="scan'208";a="373499604" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2023 06:19:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="794985503" X-IronPort-AV: E=Sophos;i="6.01,252,1684825200"; d="scan'208";a="794985503" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 03 Aug 2023 06:19:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id DC3932AB; Thu, 3 Aug 2023 16:19:21 +0300 (EEST) From: Andy Shevchenko To: Jani Nikula , Imre Deak , Andy Shevchenko , Philipp Zabel , Andi Shyti , Jiri Slaby , Greg Kroah-Hartman , Alexey Dobriyan , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Helge Deller , Rasmus Villemoes , Andrew Morton Subject: [PATCH v4 1/1] drm/i915: Move abs_diff() to math.h Date: Thu, 3 Aug 2023 16:19:18 +0300 Message-Id: <20230803131918.53727-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773215199554356355 X-GMAIL-MSGID: 1773215199554356355 abs_diff() belongs to math.h. Move it there. This will allow others to use it. Reviewed-by: Jiri Slaby # tty/serial Acked-by: Jani Nikula Acked-by: Greg Kroah-Hartman Reviewed-by: Andi Shyti Reviewed-by: Philipp Zabel # gpu/ipu-v3 Signed-off-by: Andy Shevchenko --- v4: - Cc'ed to Andrew (as Jani told he is okay to route it via other tree) - added tags drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 1 + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 7 ------- drivers/gpu/ipu-v3/ipu-image-convert.c | 15 +++++++-------- drivers/tty/serial/omap-serial.c | 7 +------ drivers/video/fbdev/core/svgalib.c | 7 +------ include/linux/math.h | 7 +++++++ 6 files changed, 17 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c index 6b2d8a1e2aa9..290e856fe9e9 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c @@ -21,6 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include "i915_reg.h" diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h index ba62eb5d7c51..04e6810954b2 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h @@ -29,13 +29,6 @@ #include "intel_wakeref.h" -/*FIXME: Move this to a more appropriate place. */ -#define abs_diff(a, b) ({ \ - typeof(a) __a = (a); \ - typeof(b) __b = (b); \ - (void) (&__a == &__b); \ - __a > __b ? (__a - __b) : (__b - __a); }) - enum tc_port; struct drm_i915_private; struct intel_atomic_state; diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c index af1612044eef..841316582ea9 100644 --- a/drivers/gpu/ipu-v3/ipu-image-convert.c +++ b/drivers/gpu/ipu-v3/ipu-image-convert.c @@ -7,7 +7,10 @@ #include #include +#include + #include