From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751603AbbCTLSB (ORCPT ); Fri, 20 Mar 2015 07:18:01 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:40313 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751081AbbCTLR7 (ORCPT ); Fri, 20 Mar 2015 07:17:59 -0400 Message-ID: <550C01E2.7070702@iki.fi> Date: Fri, 20 Mar 2015 13:17:54 +0200 From: Antti Palosaari User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Javi Merino , akpm@linux-foundation.org CC: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mauro Carvalho Chehab Subject: Re: [PATCH 4/4] media: cxd2820r: use DIV_ROUND_CLOSEST_ULL() References: <1426850083-11049-1-git-send-email-javi.merino@arm.com> <1426850083-11049-5-git-send-email-javi.merino@arm.com> In-Reply-To: <1426850083-11049-5-git-send-email-javi.merino@arm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 85.23.164.104 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/20/2015 01:14 PM, Javi Merino wrote: > Now that the kernel provides DIV_ROUND_CLOSEST_ULL(), drop the internal > implementation and use the kernel one. > > Cc: Antti Palosaari > Cc: Mauro Carvalho Chehab > Signed-off-by: Javi Merino Acked-by: Antti Palosaari Reviewed-by: Antti Palosaari Antti > --- > I've only compile-tested it, I don't have the hardware to run it. > > drivers/media/dvb-frontends/cxd2820r_c.c | 2 +- > drivers/media/dvb-frontends/cxd2820r_core.c | 6 ------ > drivers/media/dvb-frontends/cxd2820r_priv.h | 2 -- > drivers/media/dvb-frontends/cxd2820r_t.c | 2 +- > drivers/media/dvb-frontends/cxd2820r_t2.c | 2 +- > 5 files changed, 3 insertions(+), 11 deletions(-) > > diff --git a/drivers/media/dvb-frontends/cxd2820r_c.c b/drivers/media/dvb-frontends/cxd2820r_c.c > index 149fdca3fb44..72b0e2db3aab 100644 > --- a/drivers/media/dvb-frontends/cxd2820r_c.c > +++ b/drivers/media/dvb-frontends/cxd2820r_c.c > @@ -79,7 +79,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe) > > num = if_freq / 1000; /* Hz => kHz */ > num *= 0x4000; > - if_ctl = 0x4000 - cxd2820r_div_u64_round_closest(num, 41000); > + if_ctl = 0x4000 - DIV_ROUND_CLOSEST_ULL(num, 41000); > buf[0] = (if_ctl >> 8) & 0x3f; > buf[1] = (if_ctl >> 0) & 0xff; > > diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c > index 422e84bbb008..490e090048ef 100644 > --- a/drivers/media/dvb-frontends/cxd2820r_core.c > +++ b/drivers/media/dvb-frontends/cxd2820r_core.c > @@ -244,12 +244,6 @@ error: > return ret; > } > > -/* 64 bit div with round closest, like DIV_ROUND_CLOSEST but 64 bit */ > -u32 cxd2820r_div_u64_round_closest(u64 dividend, u32 divisor) > -{ > - return div_u64(dividend + (divisor / 2), divisor); > -} > - > static int cxd2820r_set_frontend(struct dvb_frontend *fe) > { > struct cxd2820r_priv *priv = fe->demodulator_priv; > diff --git a/drivers/media/dvb-frontends/cxd2820r_priv.h b/drivers/media/dvb-frontends/cxd2820r_priv.h > index 7ff5f60c83e1..4b428959b16e 100644 > --- a/drivers/media/dvb-frontends/cxd2820r_priv.h > +++ b/drivers/media/dvb-frontends/cxd2820r_priv.h > @@ -64,8 +64,6 @@ int cxd2820r_wr_reg_mask(struct cxd2820r_priv *priv, u32 reg, u8 val, > int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val, > int len); > > -u32 cxd2820r_div_u64_round_closest(u64 dividend, u32 divisor); > - > int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val, > int len); > > diff --git a/drivers/media/dvb-frontends/cxd2820r_t.c b/drivers/media/dvb-frontends/cxd2820r_t.c > index 51401d036530..008cb2ac8480 100644 > --- a/drivers/media/dvb-frontends/cxd2820r_t.c > +++ b/drivers/media/dvb-frontends/cxd2820r_t.c > @@ -103,7 +103,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe) > > num = if_freq / 1000; /* Hz => kHz */ > num *= 0x1000000; > - if_ctl = cxd2820r_div_u64_round_closest(num, 41000); > + if_ctl = DIV_ROUND_CLOSEST_ULL(num, 41000); > buf[0] = ((if_ctl >> 16) & 0xff); > buf[1] = ((if_ctl >> 8) & 0xff); > buf[2] = ((if_ctl >> 0) & 0xff); > diff --git a/drivers/media/dvb-frontends/cxd2820r_t2.c b/drivers/media/dvb-frontends/cxd2820r_t2.c > index 9c0c4f42175c..35fe364c7182 100644 > --- a/drivers/media/dvb-frontends/cxd2820r_t2.c > +++ b/drivers/media/dvb-frontends/cxd2820r_t2.c > @@ -120,7 +120,7 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe) > > num = if_freq / 1000; /* Hz => kHz */ > num *= 0x1000000; > - if_ctl = cxd2820r_div_u64_round_closest(num, 41000); > + if_ctl = DIV_ROUND_CLOSEST_ULL(num, 41000); > buf[0] = ((if_ctl >> 16) & 0xff); > buf[1] = ((if_ctl >> 8) & 0xff); > buf[2] = ((if_ctl >> 0) & 0xff); > -- http://palosaari.fi/