From patchwork Sun Dec 30 13:20:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10745087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 828896C5 for ; Sun, 30 Dec 2018 13:20:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6426928AD2 for ; Sun, 30 Dec 2018 13:20:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5827628AF8; Sun, 30 Dec 2018 13:20:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1463B28AD2 for ; Sun, 30 Dec 2018 13:20:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725953AbeL3NUc (ORCPT ); Sun, 30 Dec 2018 08:20:32 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34188 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725904AbeL3NUc (ORCPT ); Sun, 30 Dec 2018 08:20:32 -0500 Received: by mail-pf1-f193.google.com with SMTP id h3so12330086pfg.1 for ; Sun, 30 Dec 2018 05:20:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=XNETrALG7h7TgyQvSvkemRocUX2Vp8RDeHGHqd+9eyE=; b=XMJwr9owg53g9DJfGAf1eqOnWscrABUSPQ/A76gjvsPA/RJ2XzpaptOBz+qzfWBxxW Y7/B3ZYkH4LRBWsbZe/3Rb82hTOvbcHFj4QcNUcBxhl0Twc/wyh3jGquCoxIuRo9h9gu aM6FJBPwxmUDUyGHXyBG6wqaCieZsv449m3afnvrOSRyd/fp25VlrXOyec5gXj9wTJl9 AxWIcHU0v/YMxvfFndWCiUDShTLZwDruJY6GWoaHt/jwy3dywi012yov39XneenrwjP6 PqoZsPb5zCre9trknmieNa44ReFgfeuIXsvarHesf5RIdSb3dtg2QmTyquh+TBgP4TVM crdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XNETrALG7h7TgyQvSvkemRocUX2Vp8RDeHGHqd+9eyE=; b=lk/SSUxh0ASfQy6S1We+nCBQJzesWubwGzIL35/zkKyuBr/q9ojd45JoF6Vk74rOkB QXnxKggYSO9q66NHu959LMNhnwG/FEBnYyT7OnVsWto4IltSRFXg+oYMC7OT5Ro+izIR UpKuai0fEG7RJtkh+A6pye1CPcuLph+HDXNVmRorUppjZzdE2druCDZ6V2RL0xwQ85MZ OQZ/fmnxOwGr8lKeSW4RLshmv/pP54UhO7kkME5DQnEm8Nplvs94VEks4lmjGBRQLu4g zLNZ1Rz7j7bzBTQTByOhFe+uyYoMd7woc8IuRnO3Zug1rPzo/BdZVzoyzuihu+qKZ/yn kJ+Q== X-Gm-Message-State: AJcUukdu9VZDUyf0t9bTCnU3Lgw1j7E77F5Pgzdb0G/zJrfs3bgrPvYD zjxBpgOGlvi/TlCQpf2AEiLzcRogK4k= X-Google-Smtp-Source: ALg8bN5VMiiiq4hKtUqYpY0LMxqugTLXfenfGvFVUyqwKXHEXwl6Rp8+d5pOI8ZJTRwWNuH687Jx7Q== X-Received: by 2002:a63:8d44:: with SMTP id z65mr4521720pgd.57.1546176031402; Sun, 30 Dec 2018 05:20:31 -0800 (PST) Received: from localhost.localdomain ([240f:34:212d:1:80f:9263:abd:68d3]) by smtp.gmail.com with ESMTPSA id g2sm60622568pfi.95.2018.12.30.05.20.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 30 Dec 2018 05:20:30 -0800 (PST) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Eric Anholt , Stefan Wahren , Sakari Ailus , Hans Verkuil , Mauro Carvalho Chehab , Greg Kroah-Hartman Subject: [PATCH] media: staging: bcm2835-camera: use V4L2_FRACT_COMPARE Date: Sun, 30 Dec 2018 22:20:16 +0900 Message-Id: <1546176016-16245-1-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now the equivalent of FRACT_CMP() is added in v4l2 common internal API header. Cc: Eric Anholt Cc: Stefan Wahren Cc: Sakari Ailus Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Cc: Greg Kroah-Hartman Signed-off-by: Akinobu Mita --- drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index 611a6ee..7c6cf41 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -1370,10 +1370,6 @@ static int vidioc_g_parm(struct file *file, void *priv, return 0; } -#define FRACT_CMP(a, OP, b) \ - ((u64)(a).numerator * (b).denominator OP \ - (u64)(b).numerator * (a).denominator) - static int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *parm) { @@ -1387,8 +1383,8 @@ static int vidioc_s_parm(struct file *file, void *priv, /* tpf: {*, 0} resets timing; clip to [min, max]*/ tpf = tpf.denominator ? tpf : tpf_default; - tpf = FRACT_CMP(tpf, <, tpf_min) ? tpf_min : tpf; - tpf = FRACT_CMP(tpf, >, tpf_max) ? tpf_max : tpf; + tpf = V4L2_FRACT_COMPARE(tpf, <, tpf_min) ? tpf_min : tpf; + tpf = V4L2_FRACT_COMPARE(tpf, >, tpf_max) ? tpf_max : tpf; dev->capture.timeperframe = tpf; parm->parm.capture.timeperframe = tpf;