From patchwork Wed Feb 15 17:55:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9574647 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 6F22760586 for ; Wed, 15 Feb 2017 17:56:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B7E0284CC for ; Wed, 15 Feb 2017 17:56:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50814284DE; Wed, 15 Feb 2017 17:56:53 +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 95CB928502 for ; Wed, 15 Feb 2017 17:56:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752629AbdBOR4k (ORCPT ); Wed, 15 Feb 2017 12:56:40 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:33459 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752553AbdBORz6 (ORCPT ); Wed, 15 Feb 2017 12:55:58 -0500 Received: by mail-qt0-f196.google.com with SMTP id n13so22208348qtc.0; Wed, 15 Feb 2017 09:55:57 -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=YBxqrKI16LzBwj3yuijFvYmQQ6vr4itNLNzLQWMq3mY=; b=UL8ckTRNSGyf+jU2GRwP3xgP9e0zdbh5BG4b2e4NIfSKbfscXrBfMxJVjJVVhb5Fpd SxOelMN3szRuhMAgjlc9i5tmGo0tclXjxCIyJri8OMiihXutqtSXTgoumaQT3J2efFrl Ulu/3KznSpR9+Na/EOt8iSJ6SKIKrXgGhUC6ZFGghEaA0qhFV9ybkvlsdGH+jHJGejzi 9AnSBXlYsblu1fGX6faffqleYr3m3IeadejzbI83gfOW74K/aAmb1vTEthiPmeU51u6w wuZ7e4prLVvVx/S8ysCnSoLA90bGa7/521Y+lkt+OdzcDGJpRQH1zbmZxjroB56JDmqT zgBg== X-Gm-Message-State: AMke39lX7UVjTyB1Sk29f3jylCNZPgBN/3VgYqWwt2m+n1Kfz3s5/Xy7QU2gcuNxrm4/og== X-Received: by 10.200.43.201 with SMTP id n9mr36132656qtn.243.1487181357122; Wed, 15 Feb 2017 09:55:57 -0800 (PST) Received: from localhost.localdomain ([187.64.235.185]) by smtp.gmail.com with ESMTPSA id f128sm2733329qkb.3.2017.02.15.09.55.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 09:55:56 -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 6/6] [media] go7007: improve subscribe event handling Date: Wed, 15 Feb 2017 15:55:33 -0200 Message-Id: <20170215175533.6384-6-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 function to the default: branch of the switch and let it does the job for us. Signed-off-by: Gustavo Padovan --- drivers/media/usb/go7007/go7007-v4l2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c index 4eaba0c..ed5ec97 100644 --- a/drivers/media/usb/go7007/go7007-v4l2.c +++ b/drivers/media/usb/go7007/go7007-v4l2.c @@ -792,14 +792,13 @@ static int vidioc_subscribe_event(struct v4l2_fh *fh, { switch (sub->type) { - case V4L2_EVENT_CTRL: - return v4l2_ctrl_subscribe_event(fh, sub); case V4L2_EVENT_MOTION_DET: /* Allow for up to 30 events (1 second for NTSC) to be * stored. */ return v4l2_event_subscribe(fh, sub, 30, NULL); + default: + return v4l2_ctrl_subscribe_event(fh, sub); } - return -EINVAL; }