From patchwork Thu Jul 5 13:32:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todor Tomov X-Patchwork-Id: 141172 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1954711ljj; Thu, 5 Jul 2018 06:39:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeT7fTEFR/Jib/CTDbT5MkkQXewPWnKb3NNGRsUQPWbuBF/5vO6/sVVDVOeEz6ARoliN9XT X-Received: by 2002:a17:902:a5cb:: with SMTP id t11-v6mr6226599plq.71.1530797996513; Thu, 05 Jul 2018 06:39:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530797996; cv=none; d=google.com; s=arc-20160816; b=m9p2IusBbZHgYBpMblMuD4crLU1xomV/jwke/SCMTfvWdJ9SvcpQ2H7fA3nulQvAS2 TUS97zKsoLw0neGkhxAvq1LYHglC3SVVtMGwDkmqHpk994ftfnD6kBVjEDBTpJwqR/5S 8Hg41+EsS6mYswZkk24TaRAK9Oxxgsv1ZH8bXkzftZtCymkin3uV6xOS0hXt0uxIrbxh VCi781klZEytPIOVjcoWw3BLWFR6Mzpi7bOC76tf2Dm08leTY7I0rHOd4u8Xn1bulHaV 3XzNit0vHwD4CukaxJhn+cTpXKvsFhHiiebwdigNj67aYIhgRIiHCH3gpEm1R1tWany+ /1Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=4wsHeZPFiY6afuYTlWK9WhEH08a/4OUGQ13ChPWDPAo=; b=tE6BiDC+KKUWXMKIj/rXMskfL5TZdb/kgc5FYL76zapw7WC3hkDu6yR9t0d/iDTiPJ mVwfn6vF8zhpOcvFzWUGP1kITK9oaVSEl+Ju7cIJc0berl1PWz7pUIp448wErIsUECuQ JeB48Mkpk0un3q4INLi/r5Q1GQdCa9dNuclBh8B88CU+lY0/RGXTHzbWBFEtMLLBiauq KgXdFOSAks1ZKnix698vbBTPCMKSr9KNGq+eH0AziOygzYuUxfVcGgny1ek85RH7CMJz D0XsRT4JzvwLQPsAo4YCUuN2Y1jCZ6JiVoWed4w4qZprH4UbEYxa/mJz8pNJKik6jXa9 7y8g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n1-v6si3053420pfe.66.2018.07.05.06.39.56; Thu, 05 Jul 2018 06:39:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753991AbeGENjy (ORCPT + 31 others); Thu, 5 Jul 2018 09:39:54 -0400 Received: from ns.mm-sol.com ([37.157.136.199]:41327 "EHLO extserv.mm-sol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753429AbeGENdV (ORCPT ); Thu, 5 Jul 2018 09:33:21 -0400 Received: from mms-0439.qualcomm.mm-sol.com (unknown [37.157.136.206]) by extserv.mm-sol.com (Postfix) with ESMTPSA id 414F6CD54; Thu, 5 Jul 2018 16:33:17 +0300 (EEST) From: Todor Tomov To: mchehab@kernel.org, sakari.ailus@linux.intel.com, hans.verkuil@cisco.com, laurent.pinchart+renesas@ideasonboard.com, linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Todor Tomov Subject: [PATCH v2 12/34] media: camss: vfe: Get line pointer as container of video_out Date: Thu, 5 Jul 2018 16:32:43 +0300 Message-Id: <1530797585-8555-13-git-send-email-todor.tomov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530797585-8555-1-git-send-email-todor.tomov@linaro.org> References: <1530797585-8555-1-git-send-email-todor.tomov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify getting of the line pointer by using the container_of macro instead of traversing media controller links. Signed-off-by: Todor Tomov --- drivers/media/platform/qcom/camss/camss-vfe.c | 38 +++------------------------ 1 file changed, 4 insertions(+), 34 deletions(-) -- 2.7.4 diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index 51ad3f8..77167f1 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -2038,26 +2038,6 @@ static void vfe_put(struct vfe_device *vfe) } /* - * vfe_video_pad_to_line - Get pointer to VFE line by media pad - * @pad: Media pad - * - * Return pointer to vfe line structure - */ -static struct vfe_line *vfe_video_pad_to_line(struct media_pad *pad) -{ - struct media_pad *vfe_pad; - struct v4l2_subdev *subdev; - - vfe_pad = media_entity_remote_pad(pad); - if (vfe_pad == NULL) - return NULL; - - subdev = media_entity_to_v4l2_subdev(vfe_pad->entity); - - return container_of(subdev, struct vfe_line, subdev); -} - -/* * vfe_queue_buffer - Add empty buffer * @vid: Video device structure * @buf: Buffer to be enqueued @@ -2070,16 +2050,11 @@ static struct vfe_line *vfe_video_pad_to_line(struct media_pad *pad) static int vfe_queue_buffer(struct camss_video *vid, struct camss_buffer *buf) { - struct vfe_device *vfe = &vid->camss->vfe; - struct vfe_line *line; + struct vfe_line *line = container_of(vid, struct vfe_line, video_out); + struct vfe_device *vfe = to_vfe(line); struct vfe_output *output; unsigned long flags; - line = vfe_video_pad_to_line(&vid->pad); - if (!line) { - dev_err(to_device(vfe), "Can not queue buffer\n"); - return -1; - } output = &line->output; spin_lock_irqsave(&vfe->output_lock, flags); @@ -2104,16 +2079,11 @@ static int vfe_queue_buffer(struct camss_video *vid, static int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state) { - struct vfe_device *vfe = &vid->camss->vfe; - struct vfe_line *line; + struct vfe_line *line = container_of(vid, struct vfe_line, video_out); + struct vfe_device *vfe = to_vfe(line); struct vfe_output *output; unsigned long flags; - line = vfe_video_pad_to_line(&vid->pad); - if (!line) { - dev_err(to_device(vfe), "Can not flush buffers\n"); - return -1; - } output = &line->output; spin_lock_irqsave(&vfe->output_lock, flags);