From patchwork Wed Oct 28 15:55:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 315138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 376C5C2D0A3 for ; Thu, 29 Oct 2020 14:38:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD3C42087E for ; Thu, 29 Oct 2020 14:38:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727806AbgJ2Oih (ORCPT ); Thu, 29 Oct 2020 10:38:37 -0400 Received: from mga12.intel.com ([192.55.52.136]:25597 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726633AbgJ2Oig (ORCPT ); Thu, 29 Oct 2020 10:38:36 -0400 IronPort-SDR: 4m0csV/i7fOKNgyssw+j08D2uoeYtfjZrfuAQ67fh4JAp2z2iuQ52+AO+S18spKNVO/vEQTF1B X1819Y53HOfw== X-IronPort-AV: E=McAfee;i="6000,8403,9788"; a="147722770" X-IronPort-AV: E=Sophos;i="5.77,430,1596524400"; d="scan'208";a="147722770" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2020 07:38:36 -0700 IronPort-SDR: Kyk6fedtF9ySuh/QD6/Gc8jl3F9tPaT+fDyDd24VgkclWngSZbhnAtv9ITJX0GGpUIYk33+Mrc yDP91F1pLIbw== X-IronPort-AV: E=Sophos;i="5.77,430,1596524400"; d="scan'208";a="469158026" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2020 07:38:34 -0700 Received: from andy by smile with local (Exim 4.94) (envelope-from ) id 1kY95V-001JNe-3j; Thu, 29 Oct 2020 16:39:37 +0200 Received: from linux.intel.com [10.54.29.200] by smile.fi.intel.com with IMAP (fetchmail-6.4.12) for (single-drop); Wed, 28 Oct 2020 18:00:05 +0200 (EET) Received: from fmsmga001.fm.intel.com (fmsmga001.fm.intel.com [10.253.24.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id B693958087A; Wed, 28 Oct 2020 08:55:23 -0700 (PDT) IronPort-SDR: 3wiC9QmEggQr7VREF2Wrd1h67K8MiJ9WQveHTtFzpgk/5i8GTeyEvrGzYU2mKUaYvWthPEEadK z57RuWSh+zag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,427,1596524400"; d="scan'208";a="424766974" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 28 Oct 2020 08:55:21 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id EBAD4453; Wed, 28 Oct 2020 17:55:20 +0200 (EET) From: Andy Shevchenko To: Yong Zhi , Sakari Ailus , linux-media@vger.kernel.org, Tianshu Qiu , Mauro Carvalho Chehab Cc: Andy Shevchenko , Bingbu Cao Subject: [PATCH v2] media: ipu3-cio2: Use macros from mm.h Date: Wed, 28 Oct 2020 17:55:20 +0200 Message-Id: <20201028155520.14458-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org There are few nice macros in mm.h, some of which we may use here. Signed-off-by: Andy Shevchenko Reviewed-by: Bingbu Cao --- v2: rewrote to make it short and neat (Bingbu), added Rb tag (Bingbu) drivers/media/pci/intel/ipu3/ipu3-cio2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c index d4b575813300..3d0c867e9762 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -190,9 +191,8 @@ static void cio2_fbpt_entry_init_buf(struct cio2_device *cio2, * 4095 (PAGE_SIZE - 1) means every single byte in the last page * is available for DMA transfer. */ - entry[1].second_entry.last_page_available_bytes = - (remaining & ~PAGE_MASK) ? - (remaining & ~PAGE_MASK) - 1 : PAGE_SIZE - 1; + remaining = offset_in_page(remaining) ?: PAGE_SIZE; + entry[1].second_entry.last_page_available_bytes = remaining - 1; /* Fill FBPT */ remaining = length; i = 0;