From patchwork Sun Apr 8 17:39:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 48511 Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5EJR-0000JI-BG; Sun, 08 Apr 2018 17:41:09 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752791AbeDHRkh (ORCPT + 1 other); Sun, 8 Apr 2018 13:40:37 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:38238 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752591AbeDHRkd (ORCPT ); Sun, 8 Apr 2018 13:40:33 -0400 Received: by mail-pl0-f68.google.com with SMTP id c7-v6so472069plr.5 for ; Sun, 08 Apr 2018 10:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m/646qZTOJWl5ePcT+P6ARGfHYvRa4mbFDqfuadW0vc=; b=i53wLXR1tUsYE0ZL6RRv2RALkW0DSjF5dZHnLKfBhkDkB/VvjPpPuZgpBoUWdbWujC JT5lMLpcTmu/IDqLVxWEbcCureNvIRNZGS2a+qSLnzjh6Tkg4oClw7qMmVKyMKo2i5Yi CLEkAkGkG4VHj+wHRQtRCGl2A21YCNNV+yWueTG1cm1CKscj3ZZ7/TG9tLee2EXsAvjI bH+ntONJuuR1pgbO4hP3rjLQtbrFLkUKW5fObm1T7hqmV0NyuBNlyAx8sS5rc6Ek4/d2 XuMbDQoMzBA3QKhPxEGzSWrf/nxKcyyfJA5MhnpnAjsqWkw/HjSBxL57mgEV7ziIvah2 FSpw== 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:in-reply-to :references; bh=m/646qZTOJWl5ePcT+P6ARGfHYvRa4mbFDqfuadW0vc=; b=aDv/plk0A20F+ilygn3uuKCBv6GkK3879xSWNmmBiy5X2eDOeMd2D+ibJXrTyTmItU +Lkfqpp8EnOQaemGekpYpu2MkD/Ct1cbhBr22GknG4j3VeDk36XqDtrfjwEclxJuDAoM HU7dWt8ENxiX4HTFv0sgSr3TnWRl/018qwnhgYltkVqlY8PxQDGjrLSxM1VNdGHYnNlB kMOx3mpqYXjZ7QFhMPzmi3ymC44Eabmh9DHPJabto417xczKp1Qftzr6uXVI+qjjdhT7 +WMaWPW49E0ssF9zD50iZr34a0NfUzPTBfw5SK/GkfjOxmSCPqrpfXx6cNEGXDBWR8ye 8EDg== X-Gm-Message-State: AElRT7EBeKAdaWlU59i/0SZq0GgkiGlcpTqle7yd3gnHHXUsPUMViqnr 3JTW1StBtdwCZq6fecp2YnwHGg== X-Google-Smtp-Source: AIpwx4/Z3Cia3Hu+op/dYWKcaJmTXNygUBozhuJbKmhNp76/JCPcs7H/AbB3t59D8ZoZk5aUhOQ5bQ== X-Received: by 2002:a17:902:8c8c:: with SMTP id t12-v6mr35568452plo.100.1523209232285; Sun, 08 Apr 2018 10:40:32 -0700 (PDT) Received: from localhost.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by smtp.googlemail.com with ESMTPSA id r76sm31750910pfl.24.2018.04.08.10.40.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Apr 2018 10:40:31 -0700 (PDT) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: mchehab@s-opensource.com, Akihiro Tsukada , hiranotaka@zng.info Subject: [PATCH v3 5/5] dvb: earth-pt1: replace schedule_timeout with usleep_range Date: Mon, 9 Apr 2018 02:39:53 +0900 Message-Id: <20180408173953.11076-6-tskd08@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180408173953.11076-1-tskd08@gmail.com> References: <20180408173953.11076-1-tskd08@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Akihiro Tsukada As described in Document/timers/timers-howto.txt, hrtimer-based delay should be used for small sleeps. Signed-off-by: Akihiro Tsukada --- Changes since v2: - none Changes since v1: - none drivers/media/pci/pt1/pt1.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c index b169175d85e..a3126d7caac 100644 --- a/drivers/media/pci/pt1/pt1.c +++ b/drivers/media/pci/pt1/pt1.c @@ -18,7 +18,10 @@ */ #include +#include #include +#include +#include #include #include #include @@ -321,7 +324,7 @@ static int pt1_unlock(struct pt1 *pt1) for (i = 0; i < 3; i++) { if (pt1_read_reg(pt1, 0) & 0x80000000) return 0; - schedule_timeout_uninterruptible((HZ + 999) / 1000); + usleep_range(1000, 2000); } dev_err(&pt1->pdev->dev, "could not unlock\n"); return -EIO; @@ -335,7 +338,7 @@ static int pt1_reset_pci(struct pt1 *pt1) for (i = 0; i < 10; i++) { if (pt1_read_reg(pt1, 0) & 0x00000001) return 0; - schedule_timeout_uninterruptible((HZ + 999) / 1000); + usleep_range(1000, 2000); } dev_err(&pt1->pdev->dev, "could not reset PCI\n"); return -EIO; @@ -349,7 +352,7 @@ static int pt1_reset_ram(struct pt1 *pt1) for (i = 0; i < 10; i++) { if (pt1_read_reg(pt1, 0) & 0x00000002) return 0; - schedule_timeout_uninterruptible((HZ + 999) / 1000); + usleep_range(1000, 2000); } dev_err(&pt1->pdev->dev, "could not reset RAM\n"); return -EIO; @@ -366,7 +369,7 @@ static int pt1_do_enable_ram(struct pt1 *pt1) if ((pt1_read_reg(pt1, 0) & 0x00000004) != status) return 0; } - schedule_timeout_uninterruptible((HZ + 999) / 1000); + usleep_range(1000, 2000); } dev_err(&pt1->pdev->dev, "could not enable RAM\n"); return -EIO; @@ -376,7 +379,7 @@ static int pt1_enable_ram(struct pt1 *pt1) { int i, ret; int phase; - schedule_timeout_uninterruptible((HZ + 999) / 1000); + usleep_range(1000, 2000); phase = pt1->pdev->device == 0x211a ? 128 : 166; for (i = 0; i < phase; i++) { ret = pt1_do_enable_ram(pt1); @@ -463,6 +466,9 @@ static int pt1_thread(void *data) struct pt1_buffer_page *page; bool was_frozen; +#define PT1_FETCH_DELAY 10 +#define PT1_FETCH_DELAY_DELTA 2 + pt1 = data; set_freezable(); @@ -476,7 +482,13 @@ static int pt1_thread(void *data) page = pt1->tables[pt1->table_index].bufs[pt1->buf_index].page; if (!pt1_filter(pt1, page)) { - schedule_timeout_interruptible((HZ + 999) / 1000); + ktime_t delay; + + delay = PT1_FETCH_DELAY * NSEC_PER_MSEC; + set_current_state(TASK_INTERRUPTIBLE); + schedule_hrtimeout_range(&delay, + PT1_FETCH_DELAY_DELTA * NSEC_PER_MSEC, + HRTIMER_MODE_REL); continue; } @@ -712,7 +724,7 @@ pt1_update_power(struct pt1 *pt1) adap = pt1->adaps[i]; switch (adap->voltage) { case SEC_VOLTAGE_13: /* actually 11V */ - bits |= 1 << 1; + bits |= 1 << 2; break; case SEC_VOLTAGE_18: /* actually 15V */ bits |= 1 << 1 | 1 << 2; @@ -766,7 +778,7 @@ static int pt1_wakeup(struct dvb_frontend *fe) adap = container_of(fe->dvb, struct pt1_adapter, adap); adap->sleep = 0; pt1_update_power(adap->pt1); - schedule_timeout_uninterruptible((HZ + 999) / 1000); + usleep_range(1000, 2000); ret = config_demod(adap->demod_i2c_client, adap->pt1->fe_clk); if (ret == 0 && adap->orig_init) @@ -1073,7 +1085,7 @@ static int pt1_i2c_end(struct pt1 *pt1, int addr) do { if (signal_pending(current)) return -EINTR; - schedule_timeout_interruptible((HZ + 999) / 1000); + usleep_range(1000, 2000); } while (pt1_read_reg(pt1, 0) & 0x00000080); return 0; } @@ -1376,11 +1388,11 @@ static int pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pt1->power = 1; pt1_update_power(pt1); - schedule_timeout_uninterruptible((HZ + 49) / 50); + msleep(20); pt1->reset = 0; pt1_update_power(pt1); - schedule_timeout_uninterruptible((HZ + 999) / 1000); + usleep_range(1000, 2000); ret = pt1_init_frontends(pt1); if (ret < 0)