From patchwork Sun Jun 25 12:31:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RGF2aWQgSMODwqRyZGVtYW4=?= X-Patchwork-Id: 9808125 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A3925603F3 for ; Sun, 25 Jun 2017 12:31:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94CFB26E3A for ; Sun, 25 Jun 2017 12:31:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 899A2285DB; Sun, 25 Jun 2017 12:31:36 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 E4E2426E3A for ; Sun, 25 Jun 2017 12:31:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751189AbdFYMbd (ORCPT ); Sun, 25 Jun 2017 08:31:33 -0400 Received: from vader.hardeman.nu ([95.142.160.32]:56409 "EHLO hardeman.nu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050AbdFYMbd (ORCPT ); Sun, 25 Jun 2017 08:31:33 -0400 Received: from hardeman.nu (zeus.hardeman.nu [IPv6:fd27:2a41:8fcb:2::a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by vader.hardeman.nu (Postfix) with ESMTPSA id 7EA58B88; Sun, 25 Jun 2017 14:31:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hardeman.nu; s=hardeman-201705; t=1498393890; bh=/6LsdQGYVlTAcWz7McJMnKrBQ9hp+znLcKuT+YZ04J8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=eKxuLnlBJqHk8W13r50SoNmlBnp2Q0q6mOgW5qrAc5dfQOQrKKAzSpjDos59GLupZ Fz3ftqhB96HIK9T/U1zpJRSYl2CG0ReiKU5NQM9sL7LL89NrQWVoREtupWVfWYO5xQ ydJs6TrOijyNSp456nvTVavbVRlHVK/0Q0M/cs0Bl1xLAFxOq+kpR/IrY+IdYw5V1S /L+ZliQt79ONg1DwGCkrPgf8FBwiaE3W7kUFpSO1TPoc6bYyvcOgcTRNcVsJ+Z6+4v yiLWuAbDBlInIAtzqMqyZDOdokQDr973ydpbPQhrIkzUCZuMFWvN2aJlquZ0xtVtBT LPiEFTEp+0oww== Received: (nullmailer pid 29056 invoked by uid 1000); Sun, 25 Jun 2017 12:31:30 -0000 Subject: [PATCH 03/19] lirc_dev: remove min_timeout and max_timeout From: David =?utf-8?b?SMOkcmRlbWFu?= To: linux-media@vger.kernel.org Cc: mchehab@s-opensource.com, sean@mess.org Date: Sun, 25 Jun 2017 14:31:30 +0200 Message-ID: <149839388999.28811.3205928557994306883.stgit@zeus.hardeman.nu> In-Reply-To: <149839373103.28811.9486751698665303339.stgit@zeus.hardeman.nu> References: <149839373103.28811.9486751698665303339.stgit@zeus.hardeman.nu> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 There are no users of this functionality (ir-lirc-codec.c has its own implementation and lirc_zilog.c doesn't use it) so remove it. Signed-off-by: David Härdeman --- drivers/media/rc/lirc_dev.c | 18 ------------------ include/media/lirc_dev.h | 8 -------- 2 files changed, 26 deletions(-) diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c index c9afaf5e64a9..591dee9f6ba2 100644 --- a/drivers/media/rc/lirc_dev.c +++ b/drivers/media/rc/lirc_dev.c @@ -404,24 +404,6 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case LIRC_GET_LENGTH: result = put_user(ir->d.code_length, (__u32 __user *)arg); break; - case LIRC_GET_MIN_TIMEOUT: - if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) || - ir->d.min_timeout == 0) { - result = -ENOTTY; - break; - } - - result = put_user(ir->d.min_timeout, (__u32 __user *)arg); - break; - case LIRC_GET_MAX_TIMEOUT: - if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) || - ir->d.max_timeout == 0) { - result = -ENOTTY; - break; - } - - result = put_user(ir->d.max_timeout, (__u32 __user *)arg); - break; default: result = -ENOTTY; } diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h index 1419d64e2e59..53eef86e07a0 100644 --- a/include/media/lirc_dev.h +++ b/include/media/lirc_dev.h @@ -132,12 +132,6 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf, * @data: it may point to any driver data and this pointer will * be passed to all callback functions. * - * @min_timeout: Minimum timeout for record. Valid only if - * LIRC_CAN_SET_REC_TIMEOUT is defined. - * - * @max_timeout: Maximum timeout for record. Valid only if - * LIRC_CAN_SET_REC_TIMEOUT is defined. - * * @rbuf: if not NULL, it will be used as a read buffer, you will * have to write to the buffer by other means, like irq's * (see also lirc_serial.c). @@ -168,8 +162,6 @@ struct lirc_driver { unsigned int chunk_size; void *data; - int min_timeout; - int max_timeout; struct lirc_buffer *rbuf; struct rc_dev *rdev; const struct file_operations *fops;