Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / cxd2820r_t2.c

diff --git a/drivers/media/dvb-frontends/cxd2820r_t2.c b/drivers/media/dvb-frontends/cxd2820r_t2.c
index 9c0c4f42175c5d3f9289a81e0fdbc90fc3b169c1..35fe364c7182182db6bc1874a942dee83f656933 100644 (file)
--- 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);