From patchwork Wed Feb 15 17:55:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo F. Padovan" X-Patchwork-Id: 39430 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ce3op-0004kg-Rn; Wed, 15 Feb 2017 17:56:43 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-5) with esmtp id 1ce3on-0006EW-93; Wed, 15 Feb 2017 18:56:43 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752557AbdBORz6 (ORCPT + 1 other); Wed, 15 Feb 2017 12:55:58 -0500 Received: from mail-qt0-f194.google.com ([209.85.216.194]:33422 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752193AbdBORz4 (ORCPT ); Wed, 15 Feb 2017 12:55:56 -0500 Received: by mail-qt0-f194.google.com with SMTP id n13so22207902qtc.0; Wed, 15 Feb 2017 09:55:56 -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=fMyBTk7qSqD4a+9noVylxOtmP4tH1iCRKi7Bl1hX4fI=; b=q14ZnDKhiKZI/P2TxQlfe/G9Iu9z0ECw282+lMbI6k9IuIJjBxMoBGY1avP1zI9OZq IJr+emDkFJt/+sH6W6h+IWLhbyVUHTO9RCumRwZA5qtbQptFRngg1g7jgiHkf4Rs2+qc a0g53oVJa4eXspYW2p5gB2Z5G9WyfH12lX6DgpHmczBqhbNqfawbylM9PBJiMqb9AUEf TtZ33sZ2bATaJBw0LuX+UkjniPHswB2ozEuVFtOaw0+84NTItYxm/JwOucK+EnockEb1 0AA3zzodpTMCeB9jU91YLPKNVOAoUVSGfCz6cPj0MgtT5EYFsvv8PH7LARpcyvgmaFMB eBYg== X-Gm-Message-State: AMke39k1ebJZSsirCNLuFGOZyRQYvXPK5/cRAnVmgIhv4cl/yStxhWbDqLhdBdhvITuYbQ== X-Received: by 10.200.47.217 with SMTP id m25mr37313156qta.283.1487181350700; Wed, 15 Feb 2017 09:55:50 -0800 (PST) Received: from localhost.localdomain ([187.64.235.185]) by smtp.gmail.com with ESMTPSA id f128sm2733329qkb.3.2017.02.15.09.55.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 09:55:43 -0800 (PST) From: Gustavo Padovan To: linux-media@vger.kernel.org Cc: Gustavo Padovan , Bluecherry Maintainers , Andrey Utkin , Ismael Luceno , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/6] [media] solo6x10: improve subscribe event handling Date: Wed, 15 Feb 2017 15:55:30 -0200 Message-Id: <20170215175533.6384-3-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-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.2.15.174815 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Gustavo Padovan We already check for the V4L2_EVENT_CTRL inside v4l2_ctrl_subscribe_event() so just move the function to the default: branch of the switch and let it does the job for us. Signed-off-by: Gustavo Padovan Acked-by: Andrey Utkin --- drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c index 25a2137..25f9f2e 100644 --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c @@ -1140,14 +1140,13 @@ static int solo_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; } static const struct v4l2_file_operations solo_enc_fops = {