From patchwork Wed Feb 15 17:55:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9574637 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 F0B616045F for ; Wed, 15 Feb 2017 17:56:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC154284CC for ; Wed, 15 Feb 2017 17:56:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0B8728503; Wed, 15 Feb 2017 17:56:35 +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=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable 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 97FE3284CC for ; Wed, 15 Feb 2017 17:56:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752607AbdBOR4M (ORCPT ); Wed, 15 Feb 2017 12:56:12 -0500 Received: from mail-qt0-f193.google.com ([209.85.216.193]:34629 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752191AbdBOR4K (ORCPT ); Wed, 15 Feb 2017 12:56:10 -0500 Received: by mail-qt0-f193.google.com with SMTP id w20so21986476qtb.1; Wed, 15 Feb 2017 09:55:55 -0800 (PST) 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=qycc/xYIYYDByf/1ZAHUM4pcwTTl8H8YQBjTa5mc6Dk=; b=I6E3y75VBrWZUJxZdEcofv9V8Cd4P+cEha6qwb+iLxcB03nQH7ry8llBoBIpUJkkkx Q2zuBSqKKmlxZbrs7rbqYAGbtzub7CpCkX1G6228MKBFQJQBlNlhBc7/Ot1Pkght3nCe Yu7nECRrh6BnQdR7TTVoGEeWZ3ccxnW+DwGoBLF7qE4GJYckpyA8aJadnJUyTkdQWASK 22+t6smYNy0cwYl2MdEca6gvl0oI/hYurVu7HMKE+9K1UlYFaAqtfIPGPxuQPEh21vKh /Cn/4xpuOZHRsU9SpT8DRRCLzacXdLJ7dRv7r7B+cBK3d8PJLANiAF4di14fji91BUvV hIaQ== X-Gm-Message-State: AMke39lT7Bardrun1gkiQkADqBZg+rTOFW90SRLAe5NVGv/WEU6bMZ0dZjgd6riD0Kh3/w== X-Received: by 10.200.49.157 with SMTP id h29mr36747392qte.289.1487181355007; Wed, 15 Feb 2017 09:55:55 -0800 (PST) Received: from localhost.localdomain ([187.64.235.185]) by smtp.gmail.com with ESMTPSA id f128sm2733329qkb.3.2017.02.15.09.55.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 09:55:54 -0800 (PST) From: Gustavo Padovan To: linux-media@vger.kernel.org Cc: Gustavo Padovan , Hans Verkuil , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 5/6] [media] vivid: improve subscribe event handling Date: Wed, 15 Feb 2017 15:55:32 -0200 Message-Id: <20170215175533.6384-5-gustavo@padovan.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170215175533.6384-1-gustavo@padovan.org> References: <20170215175533.6384-1-gustavo@padovan.org> 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 From: Gustavo Padovan We already check for the V4L2_EVENT_CTRL inside v4l2_ctrl_subscribe_event() so just move this fuction to the default: branch of the switch and let it does the job for us. Signed-off-by: Gustavo Padovan --- drivers/media/platform/vivid/vivid-vid-out.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index 7ba52ee..1a33730 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -1172,14 +1172,12 @@ int vidioc_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subscription *sub) { switch (sub->type) { - case V4L2_EVENT_CTRL: - return v4l2_ctrl_subscribe_event(fh, sub); case V4L2_EVENT_SOURCE_CHANGE: if (fh->vdev->vfl_dir == VFL_DIR_RX) return v4l2_src_change_event_subscribe(fh, sub); break; default: - break; + return v4l2_ctrl_subscribe_event(fh, sub); } return -EINVAL; }