Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1360021ybl; Fri, 16 Aug 2019 13:36:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqwawSYDsGG/eFrmV59yGaErvHSZlyGwQ8RJPyp9MkmUHBJfZ8chOCAa4HOHTTlnXWC5fSqz X-Received: by 2002:a17:902:f204:: with SMTP id gn4mr11203590plb.3.1565987771520; Fri, 16 Aug 2019 13:36:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565987771; cv=none; d=google.com; s=arc-20160816; b=M+TuLxE/Tm7LLVsrZskfIqtrnwHXAeu8rSbSCMMpK+IH69HfPgZ57mS43JhzKYOqu9 fqU5qL0lUTAQgTFpjxS1uAuSRVY4yAxRgRnaYPW3UrG0KwM4gs0tDk5J+wq/LB1ebHUh FxRRhqqBpVr9JK0Bt3sgDYQOfRkW9eqxFoTDiq1IahRlYvKfa/Ni4viAniXGGpE263Sg VNBihZQEU7CR+L8ef8ua1Cp7YVFWu08tfQbXeZtfaUwjYDBlZZG/DFzTd5KcQXpiUNji Pz0HenPQN/eLrPoVV7vC/1RTuEbfPT0BTZMNtzn3HEsoo6Ibo+s3kKLakrbwVhMMvZcH R2bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:openpgp:from:references:cc:to:subject; bh=hYyIpC8muixjZERuoyyiaHPGBLIkRXYQAiFdZkw1+RM=; b=UPNbJKiGX9uqWk5e4eG3x8eT82gB/qSdplt507pzHtHcAqJ8ynvkbjxxRdbSTbe2QS NaJZ8bP8b+5i11v432CbA6VkhS/njUelpVDjjx/97gFXKrHLTK3qmy61SrsNkqqxrbZ5 rvfu4u/dw+nIpN2KffkEisOa41J6VuCfDsuxlUchcHnx6Mr9nilrdWEufFxtgWLKjTZ3 sV9Cx7ku10bZWvN8yNIKNONM8EAGAvcRhZDfXCMVj+R/62VISG9v/KUC/vBZO9dLpoAg My1EOOeF2ng1vSAkl/u1CRQTtXa0mZK0C7yO3KeSsawZvOv99GuVY3zglxFWB1kxyIH3 X+XQ== 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=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y184si5127630pfb.162.2019.08.16.13.35.56; Fri, 16 Aug 2019 13:36:11 -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=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727660AbfHPUfX (ORCPT + 99 others); Fri, 16 Aug 2019 16:35:23 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:52676 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727572AbfHPUfX (ORCPT ); Fri, 16 Aug 2019 16:35:23 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id EF5F028D25B Subject: Re: [PATCH v2 1/2] media: vimc: Collapse component structure into a single monolithic driver To: Shuah Khan , mchehab@kernel.org, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, andrealmeid@collabora.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org References: <9439500242e4ac54ff55aedf56df0216a96c0ce9.1565740213.git.skhan@linuxfoundation.org> From: Helen Koike Openpgp: preference=signencrypt Autocrypt: addr=helen.koike@collabora.com; keydata= mQINBFmOMD4BEADb2nC8Oeyvklh+ataw2u/3mrl+hIHL4WSWtii4VxCapl9+zILuxFDrxw1p XgF3cfx7g9taWBrmLE9VEPwJA6MxaVnQuDL3GXxTxO/gqnOFgT3jT+skAt6qMvoWnhgurMGH wRaA3dO4cFrDlLsZIdDywTYcy7V2bou81ItR5Ed6c5UVX7uTTzeiD/tUi8oIf0XN4takyFuV Rf09nOhi24bn9fFN5xWHJooFaFf/k2Y+5UTkofANUp8nn4jhBUrIr6glOtmE0VT4pZMMLT63 hyRB+/s7b1zkOofUGW5LxUg+wqJXZcOAvjocqSq3VVHcgyxdm+Nv0g9Hdqo8bQHC2KBK86VK vB+R7tfv7NxVhG1sTW3CQ4gZb0ZugIWS32Mnr+V+0pxci7QpV3jrtVp5W2GA5HlXkOyC6C7H Ao7YhogtvFehnlUdG8NrkC3HhCTF8+nb08yGMVI4mMZ9v/KoIXKC6vT0Ykz434ed9Oc9pDow VUqaKi3ey96QczfE4NI029bmtCY4b5fucaB/aVqWYRH98Jh8oIQVwbt+pY7cL5PxS7dQ/Zuz 6yheqDsUGLev1O3E4R8RZ8jPcfCermL0txvoXXIA56t4ZjuHVcWEe2ERhLHFGq5Zw7KC6u12 kJoiZ6WDBYo4Dp+Gd7a81/WsA33Po0j3tk/8BWoiJCrjXzhtRwARAQABtCdIZWxlbiBLb2lr ZSA8aGVsZW4ua29pa2VAY29sbGFib3JhLmNvbT6JAlQEEwEKAD4CGwEFCwkIBwMFFQoJCAsF FgIDAQACHgECF4AWIQSofQA6zrItXEgHWTzAfqwo9yFiXQUCXEz3bwUJBKaPRQAKCRDAfqwo 9yFiXdUCD/4+WZr503hQ13KB4DijOW76ju8JDPp4p++qoPxtoAsld3yROoTI+VPWmt7ojHrr TZc7sTLxOFzaUC8HjGTb3r9ilIhIKf/M9KRLkpIJ+iLA+VoUbcSOMYWoVNfgLmbnqoezjPcy OHJwVw9dzEeYpvG6nkY6E4UktANySp27AniSXNuHOvYsOsXmUOqU1ScdsrQ9s732p/OGdTyw 1yd3gUMLZvCKFOBVHILH59HCRJgpwUPiws8G4dGMs4GTRvHT2s2mDQdQ0HEvcM9rvCRVixuC 5ZeOymZNi6lDIUIysgiZ+yzk6i5l/Ni6r7v20N3JppZvhPK6LqtaYceyAGyc3jjnOqoHT/qR kPjCwzmKiPtXjLw6HbRXtGgGtP5m3y8v6bfHH+66zd2vGCY0Z9EsqcnK4DCqRkLncFLPM2gn 9cZcCmO4ZqXUhTyn1nHM494kd5NX1Op4HO+t9ErnpufkVjoMUeBwESdQwwwHT3rjUueGmCrn VJK69/qhA4La72VTxHutl+3Z0Xy20HWsZS8Gsam39f95/LtPLzbBwnOOi5ZoXnm97tF8HrAZ 2h+kcRLMWw3BXy5q4gic+oFZMZP9oq1G9XTFld4FGgJ9ys8aGmhLM+uB1pFxb3XFtWQ2z4AJ iEp2VLl34quwfD6Gg4csiZe2KzvQHUe0w8SJ9LplrHPPprkCDQRZjjChARAAzISLQaHzaDOv ZxcoCNBk/hUGo2/gsmBW4KSj73pkStZ+pm3Yv2CRtOD4jBlycXjzhwBV7/70ZMH70/Y25dJa CnJKl/Y76dPPn2LDWrG/4EkqUzoJkhRIYFUTpkPdaVYznqLgsho19j7HpEbAum8r3jemYBE1 AIuVGg4bqY3UkvuHWLVRMuaHZNy55aYwnUvd46E64JH7O990mr6t/nu2a1aJ0BDdi8HZ0RMo Eg76Avah+YR9fZrhDFmBQSL+mcCVWEbdiOzHmGYFoToqzM52wsNEpo2aStH9KLk8zrCXGx68 ohJyQoALX4sS03RIWh1jFjnlw2FCbEdj/HDX0+U0i9COtanm54arYXiBTnAnx0F7LW7pv7sb 6tKMxsMLmprP/nWyV5AfFRi3jxs5tdwtDDk/ny8WH6KWeLR/zWDwpYgnXLBCdg8l97xUoPQO 0VkKSa4JEXUZWZx9q6kICzFGsuqApqf9gIFJZwUmirsxH80Fe04Tv+IqIAW7/djYpOqGjSyk oaEVNacwLLgZr+/j69/1ZwlbS8K+ChCtyBV4kEPzltSRZ4eU19v6sDND1JSTK9KSDtCcCcAt VGFlr4aE00AD/aOkHSylc93nPinBFO4AGhcs4WypZ3GGV6vGWCpJy9svfWsUDhSwI7GS/i/v UQ1+bswyYEY1Q3DjJqT7fXcAEQEAAYkEcgQYAQoAJgIbAhYhBKh9ADrOsi1cSAdZPMB+rCj3 IWJdBQJcTPfVBQkEpo7hAkDBdCAEGQEKAB0WIQSomGMEg78Cd/pMshveCRfNeJ05lgUCWY4w oQAKCRDeCRfNeJ05lp0gD/49i95kPKjpgjUbYeidjaWuINXMCA171KyaBAp+Jp2Qrun4sIJB Z6srMj6O/gC34AhZln2sXeQdxe88sNbg6HjlN+4AkhTd6DttjOfUwnamLDA7uw+YIapGgsgN lznjLnqOaQ9mtEwRbZMUOdyRf9osSuL14vHl4ia3bYNJ52WYre6gLMu4K+Ghd02og+ILgIio Q827h0spqIJYHrR3Ynnhxdlv5GPCobh+AKsQMdTIuCzR6JSCBk6GHkg33SiWScKMUzT8B/cn ypLfGnfV/LDZ9wS2TMzIlK/uv0Vd4C0OGDd/GCi5Gwu/Ot0aY7fzZo2CiRV+/nJBWPRRBTji bE4FG2rt7WSRLO/QmH2meIW4f0USDiHeNwznHkPei59vRdlMyQdsxrmgSRDuX9Y3UkERxbgd uscqC8Cpcy5kpF11EW91J8aGpcxASc+5Pa66/+7CrpBC2DnfcfACdMAje7yeMn9XlHrqXNlQ GaglEcnGN2qVqRcKgcjJX+ur8l56BVpBPFYQYkYkIdQAuhlPylxOvsMcqI6VoEWNt0iFF3dA //0MNb8fEqw5TlxDPOt6BDhDKowkxOGIA9LOcF4PkaR9Qkvwo2P4vA/8fhCnMqlSPom4xYdk Ev8P554zDoL/XMHl+s7A0MjIJzT253ejZKlWeO68pAbNy/z7QRn2lFDnjwkQwH6sKPchYl2f 0g//Yu3vDkqk8+mi2letP3XBl2hjv2eCZjTh34VvtgY5oeL2ROSJWNd18+7O6q3hECZ727EW gIb3LK9g4mKF6+Rch6Gwz1Y4fmC5554fd2Y2XbVzzz6AGUC6Y+ohNg7lTAVO4wu43+IyTB8u ip5rX/JDGFv7Y1sl6tQJKAVIKAJE+Z3Ncqh3doQr9wWHl0UiQYKbSR9HpH1lmC1C3EEbTpwK fUIpZd1eQNyNJl1jHsZZIBYFsAfVNH/u6lB1TU+9bSOsV5SepdIb88d0fm3oZ4KzjhRHLFQF RwNUNn3ha6x4fbxYcwbvu5ZCiiX6yRTPoage/LUNkgQNX2PtPcur6CdxK6Pqm8EAI7PmYLfN NY3y01XhKNRvaVZoH2FugfUkhsBITglTIpI+n6YU06nDAcbeINFo67TSE0iL6Pek5a6gUQQC 6w+hJCaMr8KYud0q3ccHyU3TlAPDe10En3GsVz7Y5Sa3ODGdbmkfjK8Af3ogGNBVmpV16Xl8 4rETFv7POSUB2eMtbpmBopd+wKqHCwUEy3fx1zDbM9mp+pcDoL73rRZmlgmNfW/4o4qBzxRf FYTQLE69wAFU2IFce9PjtUAlBdC+6r3X24h3uD+EC37s/vWhxuKj2glaU9ONrVJ/SPvlqXOO WR1Zqw57vHMKimLdG3c24l8PkSw1usudgAA5OyO5Ag0EWY4wyQEQAMVp0U38Le7d80Mu6AT+ 1dMes87iKn30TdMuLvSg2uYqJ1T2riRBF7zU6u74HF6zps0rPQviBXOgoSuKa1hnS6OwFb9x yQPlk76LY96SUB5jPWJ3fO78ZGSwkVbJFuG9gpD/41n8Unn1hXgDb2gUaxD0oXv/723EmTYC vSo3z6Y8A2aBQNr+PyhQAPDazvVQ+P7vnZYq1oK0w+D7aIix/Bp4mo4VbgAeAeMxXWSZs8N5 NQtXeTBgB7DqrfJP5wWwgCsROfeds6EoddcYgqhG0zVU9E54C8JcPOA0wKVs+9+gt2eyRNtx 0UhFbah7qXuJGhWy/0CLXvVoCoS+7qpWz070TBAlPZrg9D0o2gOw01trQgoKAYBKKgJhxaX/ 4gzi+5Ccm33LYH9lAVTdzdorejuV1xWdsnNyc8OAPeoXBf9RIIWfQVmbhVXBp2DAPjV6/kIJ Eml7MNJfEvqjV9zKsWF9AFlsqDWZDCyUdqR96ahTSD34pRwb6a9H99/GrjeowKaaL95DIVZT C6STvDNL6kpys4sOe2AMmQGv2MMcJB3aYLzH8f1sEQ9S0UMX7/6CifEG6JodG6Y/W/lLo1Vv DxeDA+u4Lgq6qxlksp8M78FjcmxFVlf4cpCi2ucbZxurhlBkjtZZ8MVAEde3hlqjcBl2Ah6Q D826FTxscOGlHEfNABEBAAGJAjwEGAEKACYCGwwWIQSofQA6zrItXEgHWTzAfqwo9yFiXQUC XEz31QUJBKaOuQAKCRDAfqwo9yFiXUvnEACBWe8wSnIvSX+9k4LxuLq6GQTOt+RNfliZQkCW 5lT3KL1IJyzzOm4x+/slHRBl8bF7KEZyOPinXQXyJ/vgIdgSYxDqoZ7YZn3SvuNe4aT6kGwL EYYEV8Ecj4ets15FR2jSUNnVv5YHWtZ7bP/oUzr2LT54fjRcstYxgwzoj8AREtHQ4EJWAWCO ZuEHTSm5clMFoi41CmG4DlJbzbo4YfilKYm69vwh50Y8WebcRN31jh0g8ufjOJnBldYYBLwN Obymhlfy/HKBDIbyCGBuwYoAkoJ6LR/cqzl/FuhwhuDocCGlXyYaJOwXgHaCvVXI3PLQPxWZ +vPsD+TSVHc9m/YWrOiYDnZn6aO0Uk1Zv/m9+BBkWAwsreLJ/evn3SsJV1omNBTITG+uxXcf JkgmmesIAw8mpI6EeLmReUJLasz8QkzhZIC7t5rGlQI94GQG3Jg2dC+kpaGWOaT5G4FVMcBj iR1nXfMxENVYnM5ag7mBZyD/kru5W1Uj34L6AFaDMXFPwedSCpzzqUiHb0f+nYkfOodf5xy0 46+3THy/NUS/ZZp/rI4F7Y77+MQPVg7vARfHHX1AxYUKfRVW5j88QUB70txn8Vgi1tDrOr4J eD+xr0CvIGa5lKqgQacQtGkpOpJ8zY4ObSvpNubey/qYUE3DCXD0n2Xxk4muTvqlkFpOYA== Message-ID: <4470778d-23e7-4b59-3575-81df0a9c19d0@collabora.com> Date: Fri, 16 Aug 2019 17:35:12 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <9439500242e4ac54ff55aedf56df0216a96c0ce9.1565740213.git.skhan@linuxfoundation.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Shuah, Thanks for the patch, just some small comments below. On 8/15/19 4:42 PM, Shuah Khan wrote: > vimc uses Component API to split the driver into functional components. > The real hardware resembles a monolith structure than component and > component structure added a level of complexity making it hard to > maintain without adding any real benefit. > > The sensor is one vimc component that would makes sense to be a separate > module to closely align with the real hardware. It would be easier to > collapse vimc into single monolithic driver first and then split the > sensor off as a separate module. > > Collapse it into a single monolithic driver removing the Component API. > This patch removes the component API and makes minimal changes to the > code base preserving the functional division of the code structure. > Preserving the functional structure allows us to split the sensor off > as a separate module in the future. > > Major design elements in this change are: > - Use existing struct vimc_ent_config and struct vimc_pipeline_config > to drive the initialization of the functional components. > - Make vimc_device and vimc_ent_config global by moving them to > vimc-common.h > - Add two new hooks add and rm to initialize and register, unregister > and free subdevs. > - All component API is now gone and bind and unbind hooks are modified > to do "add" and "rm" with minimal changes to just add and rm subdevs. > - vimc-core's bind and unbind are now register and unregister. > - vimc-core invokes "add" hooks from its vimc_register_devices(). > The "add" hooks remain the same and register subdevs. They don't > create platform devices of their own and use vimc's pdev.dev as > their reference device. The "add" hooks save their vimc_ent_device(s) > in the corresponding vimc_ent_config. > - vimc-core invokes "rm" hooks from its unregister to unregister subdevs > and cleanup. > - vimc-core invokes "add" and "rm" hooks with pointer to struct vimc_device > and the corresponding struct vimc_ent_config pointer. > > The following configure and stream test works on all devices. > > media-ctl -d platform:vimc -V '"Sensor A":0[fmt:SBGGR8_1X8/640x480]' > media-ctl -d platform:vimc -V '"Debayer A":0[fmt:SBGGR8_1X8/640x480]' > media-ctl -d platform:vimc -V '"Sensor B":0[fmt:SBGGR8_1X8/640x480]' > media-ctl -d platform:vimc -V '"Debayer B":0[fmt:SBGGR8_1X8/640x480]' > > v4l2-ctl -z platform:vimc -d "RGB/YUV Capture" -v width=1920,height=1440 > v4l2-ctl -z platform:vimc -d "Raw Capture 0" -v pixelformat=BA81 > v4l2-ctl -z platform:vimc -d "Raw Capture 1" -v pixelformat=BA81 > > v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video1 > v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video2 > v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video3 > > Signed-off-by: Shuah Khan > --- > drivers/media/platform/vimc/Makefile | 7 +- > drivers/media/platform/vimc/vimc-capture.c | 75 ++------- > drivers/media/platform/vimc/vimc-common.h | 54 ++++++ > drivers/media/platform/vimc/vimc-core.c | 182 +++++++-------------- > drivers/media/platform/vimc/vimc-debayer.c | 68 ++------ > drivers/media/platform/vimc/vimc-scaler.c | 68 ++------ > drivers/media/platform/vimc/vimc-sensor.c | 69 ++------ > 7 files changed, 157 insertions(+), 366 deletions(-) > > diff --git a/drivers/media/platform/vimc/Makefile b/drivers/media/platform/vimc/Makefile > index 96d06f030c31..a53b2b532e9f 100644 > --- a/drivers/media/platform/vimc/Makefile > +++ b/drivers/media/platform/vimc/Makefile > @@ -1,5 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > -vimc-y := vimc-core.o vimc-common.o vimc-streamer.o > +vimc-y := vimc-core.o vimc-common.o vimc-streamer.o vimc-capture.o \ > + vimc-debayer.o vimc-scaler.o vimc-sensor.o > + > +obj-$(CONFIG_VIDEO_VIMC) += vimc.o > > -obj-$(CONFIG_VIDEO_VIMC) += vimc.o vimc-capture.o vimc-debayer.o \ > - vimc-scaler.o vimc-sensor.o > diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c > index 664855708fdf..0b5cd38fbeb9 100644 > --- a/drivers/media/platform/vimc/vimc-capture.c > +++ b/drivers/media/platform/vimc/vimc-capture.c > @@ -5,10 +5,6 @@ > * Copyright (C) 2015-2017 Helen Koike > */ > > -#include > -#include > -#include > -#include > #include > #include > #include > @@ -16,8 +12,6 @@ > #include "vimc-common.h" > #include "vimc-streamer.h" > > -#define VIMC_CAP_DRV_NAME "vimc-capture" > - > static const u32 vimc_cap_supported_pixfmt[] = { > V4L2_PIX_FMT_BGR24, > V4L2_PIX_FMT_RGB24, > @@ -367,11 +361,11 @@ static void vimc_cap_release(struct video_device *vdev) > kfree(vcap); > } > > -static void vimc_cap_comp_unbind(struct device *comp, struct device *master, > - void *master_data) > +void vimc_cap_rm(struct vimc_device *vimc, struct vimc_ent_config *vent) This is just a detail (is up to you), but I would rename vent to something what would reflect the "config" part of vimc_ent_config, maybe vec to contrast with ved? Or vent_c ? As I said is it just a detail to help not to confuse it with the vimc_ent_device. Feel free to take this suggestion or not. This comment also applies to other usages of vimc_add_subdevs below. > { > - struct vimc_ent_device *ved = dev_get_drvdata(comp); > - struct vimc_cap_device *vcap = container_of(ved, struct vimc_cap_device, > + struct vimc_ent_device *ved = vent->ved; > + struct vimc_cap_device *vcap = container_of(ved, > + struct vimc_cap_device, > ved); > > vb2_queue_release(&vcap->queue); > @@ -418,11 +412,9 @@ static void *vimc_cap_process_frame(struct vimc_ent_device *ved, > return NULL; > } > > -static int vimc_cap_comp_bind(struct device *comp, struct device *master, > - void *master_data) > +int vimc_cap_add(struct vimc_device *vimc, struct vimc_ent_config *vent) > { > - struct v4l2_device *v4l2_dev = master_data; > - struct vimc_platform_data *pdata = comp->platform_data; > + struct v4l2_device *v4l2_dev = &vimc->v4l2_dev; > struct vimc_cap_device *vcap; > struct video_device *vdev; > struct vb2_queue *q; > @@ -442,7 +434,7 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, > } > > /* Initialize the media entity */ > - vcap->vdev.entity.name = pdata->entity_name; > + vcap->vdev.entity.name = vent->name; > vcap->vdev.entity.function = MEDIA_ENT_F_IO_V4L; > ret = media_entity_pads_init(&vcap->vdev.entity, > 1, vcap->ved.pads); > @@ -466,8 +458,8 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, > > ret = vb2_queue_init(q); > if (ret) { > - dev_err(comp, "%s: vb2 queue init failed (err=%d)\n", > - pdata->entity_name, ret); > + dev_err(&vimc->pdev.dev, "%s: vb2 queue init failed (err=%d)\n", > + vent->name, ret); > goto err_clean_m_ent; > } > > @@ -484,8 +476,7 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, > vcap->ved.ent = &vcap->vdev.entity; > vcap->ved.process_frame = vimc_cap_process_frame; > vcap->ved.vdev_get_format = vimc_cap_get_format; > - dev_set_drvdata(comp, &vcap->ved); > - vcap->dev = comp; > + vcap->dev = &vimc->pdev.dev; > > /* Initialize the video_device struct */ > vdev = &vcap->vdev; > @@ -498,17 +489,18 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, > vdev->queue = q; > vdev->v4l2_dev = v4l2_dev; > vdev->vfl_dir = VFL_DIR_RX; > - strscpy(vdev->name, pdata->entity_name, sizeof(vdev->name)); > + strscpy(vdev->name, vent->name, sizeof(vdev->name)); > video_set_drvdata(vdev, &vcap->ved); > > /* Register the video_device with the v4l2 and the media framework */ > ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); > if (ret) { > - dev_err(comp, "%s: video register failed (err=%d)\n", > + dev_err(&vimc->pdev.dev, "%s: video register failed (err=%d)\n", > vcap->vdev.name, ret); > goto err_release_queue; > } > > + vent->ved = &vcap->ved; > return 0; > > err_release_queue: > @@ -522,44 +514,3 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, > > return ret; > } > - > -static const struct component_ops vimc_cap_comp_ops = { > - .bind = vimc_cap_comp_bind, > - .unbind = vimc_cap_comp_unbind, > -}; > - > -static int vimc_cap_probe(struct platform_device *pdev) > -{ > - return component_add(&pdev->dev, &vimc_cap_comp_ops); > -} > - > -static int vimc_cap_remove(struct platform_device *pdev) > -{ > - component_del(&pdev->dev, &vimc_cap_comp_ops); > - > - return 0; > -} > - > -static const struct platform_device_id vimc_cap_driver_ids[] = { > - { > - .name = VIMC_CAP_DRV_NAME, > - }, > - { } > -}; > - > -static struct platform_driver vimc_cap_pdrv = { > - .probe = vimc_cap_probe, > - .remove = vimc_cap_remove, > - .id_table = vimc_cap_driver_ids, > - .driver = { > - .name = VIMC_CAP_DRV_NAME, > - }, > -}; > - > -module_platform_driver(vimc_cap_pdrv); > - > -MODULE_DEVICE_TABLE(platform, vimc_cap_driver_ids); > - > -MODULE_DESCRIPTION("Virtual Media Controller Driver (VIMC) Capture"); > -MODULE_AUTHOR("Helen Mae Koike Fornazier "); > -MODULE_LICENSE("GPL"); > diff --git a/drivers/media/platform/vimc/vimc-common.h b/drivers/media/platform/vimc/vimc-common.h > index 7b4d988b208b..cfc9143686b0 100644 > --- a/drivers/media/platform/vimc/vimc-common.h > +++ b/drivers/media/platform/vimc/vimc-common.h > @@ -9,6 +9,7 @@ > #define _VIMC_COMMON_H_ > > #include > +#include > #include > #include > > @@ -69,6 +70,28 @@ struct vimc_platform_data { > char entity_name[32]; > }; > > +/** > + * struct vimc_device - main device for vimc driver > + * > + * @pdev pointer to the platform device > + * @pipe_cfg pointer to the vimc pipeline configuration structure > + * @mdev the associated media_device parent > + * @v4l2_dev Internal v4l2 parent device > + */ > +struct vimc_device { > + /* The platform device */ I think we can drop this comments in the struct as we have them in the top. > + struct platform_device pdev; > + > + /* The pipeline configuration */ > + const struct vimc_pipeline_config *pipe_cfg; > + > + /* The Associated media_device parent */ > + struct media_device mdev; > + > + /* Internal v4l2 parent device */ > + struct v4l2_device v4l2_dev; > +}; > + > /** > * struct vimc_ent_device - core struct that represents a node in the topology > * > @@ -97,6 +120,37 @@ struct vimc_ent_device { > struct v4l2_pix_format *fmt); > }; > > +/** > + * struct vimc_ent_config Structure which describes individual > + * configuration for each entity > + * > + * @name entity name > + * @ved pointer to vimc_ent_device (a node in the topology) > + * @add subdev add hook - initializes and registers subdev > + * called from vimc-core > + * @rm subdev rm hook - unregisters and frees subdev > + * called from vimc-core > + */ > +struct vimc_ent_config { > + const char *name; > + struct vimc_ent_device *ved; > + int (*add)(struct vimc_device *vimc, struct vimc_ent_config *vent); > + void (*rm)(struct vimc_device *vimc, struct vimc_ent_config *vent); > +}; > + > +/* prototypes for vimc_ent_config add and rm hooks */ > +int vimc_cap_add(struct vimc_device *vimc, struct vimc_ent_config *vent); > +void vimc_cap_rm(struct vimc_device *vimc, struct vimc_ent_config *vent); > + > +int vimc_deb_add(struct vimc_device *vimc, struct vimc_ent_config *vent); > +void vimc_deb_rm(struct vimc_device *vimc, struct vimc_ent_config *vent); > + > +int vimc_sca_add(struct vimc_device *vimc, struct vimc_ent_config *vent); > +void vimc_sca_rm(struct vimc_device *vimc, struct vimc_ent_config *vent); > + > +int vimc_sen_add(struct vimc_device *vimc, struct vimc_ent_config *vent); > +void vimc_sen_rm(struct vimc_device *vimc, struct vimc_ent_config *vent); > + > /** > * vimc_mbus_code_supported - helper to check supported mbus codes > * > diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c > index 571c55aa0e16..334f60468d06 100644 > --- a/drivers/media/platform/vimc/vimc-core.c > +++ b/drivers/media/platform/vimc/vimc-core.c > @@ -5,7 +5,6 @@ > * Copyright (C) 2015-2017 Helen Koike > */ > > -#include > #include > #include > #include > @@ -24,29 +23,6 @@ > .flags = link_flags, \ > } > > -struct vimc_device { > - /* The platform device */ > - struct platform_device pdev; > - > - /* The pipeline configuration */ > - const struct vimc_pipeline_config *pipe_cfg; > - > - /* The Associated media_device parent */ > - struct media_device mdev; > - > - /* Internal v4l2 parent device*/ > - struct v4l2_device v4l2_dev; > - > - /* Subdevices */ > - struct platform_device **subdevs; > -}; > - > -/* Structure which describes individual configuration for each entity */ > -struct vimc_ent_config { > - const char *name; > - const char *drv; > -}; > - > /* Structure which describes links between entities */ > struct vimc_ent_link { > unsigned int src_ent; > @@ -58,7 +34,7 @@ struct vimc_ent_link { > > /* Structure which describes the whole topology */ > struct vimc_pipeline_config { > - const struct vimc_ent_config *ents; > + struct vimc_ent_config *ents; > size_t num_ents; > const struct vimc_ent_link *links; > size_t num_links; > @@ -68,43 +44,52 @@ struct vimc_pipeline_config { > * Topology Configuration > */ > > -static const struct vimc_ent_config ent_config[] = { > +static struct vimc_ent_config ent_config[] = { > { > .name = "Sensor A", > - .drv = "vimc-sensor", > + .add = vimc_sen_add, > + .rm = vimc_sen_rm, > }, > { > .name = "Sensor B", > - .drv = "vimc-sensor", > + .add = vimc_sen_add, > + .rm = vimc_sen_rm, > }, > { > .name = "Debayer A", > - .drv = "vimc-debayer", > + .add = vimc_deb_add, > + .rm = vimc_deb_rm, > }, > { > .name = "Debayer B", > - .drv = "vimc-debayer", > + .add = vimc_deb_add, > + .rm = vimc_deb_rm, > }, > { > .name = "Raw Capture 0", > - .drv = "vimc-capture", > + .add = vimc_cap_add, > + .rm = vimc_cap_rm, > }, > { > .name = "Raw Capture 1", > - .drv = "vimc-capture", > + .add = vimc_cap_add, > + .rm = vimc_cap_rm, > }, > { > - .name = "RGB/YUV Input", > /* TODO: change this to vimc-input when it is implemented */ > - .drv = "vimc-sensor", > + .name = "RGB/YUV Input", > + .add = vimc_sen_add, > + .rm = vimc_sen_rm, > }, > { > .name = "Scaler", > - .drv = "vimc-scaler", > + .add = vimc_sca_add, > + .rm = vimc_sca_rm, > }, > { > .name = "RGB/YUV Capture", > - .drv = "vimc-capture", > + .add = vimc_cap_add, > + .rm = vimc_cap_rm, > }, > }; > > @@ -127,7 +112,7 @@ static const struct vimc_ent_link ent_links[] = { > VIMC_ENT_LINK(7, 1, 8, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), > }; > > -static const struct vimc_pipeline_config pipe_cfg = { > +static struct vimc_pipeline_config pipe_cfg = { > .ents = ent_config, > .num_ents = ARRAY_SIZE(ent_config), > .links = ent_links, > @@ -144,14 +129,11 @@ static int vimc_create_links(struct vimc_device *vimc) > /* Initialize the links between entities */ > for (i = 0; i < vimc->pipe_cfg->num_links; i++) { > const struct vimc_ent_link *link = &vimc->pipe_cfg->links[i]; > - /* > - * TODO: Check another way of retrieving ved struct without > - * relying on platform_get_drvdata > - */ > + > struct vimc_ent_device *ved_src = > - platform_get_drvdata(vimc->subdevs[link->src_ent]); > + vimc->pipe_cfg->ents[link->src_ent].ved; > struct vimc_ent_device *ved_sink = > - platform_get_drvdata(vimc->subdevs[link->sink_ent]); > + vimc->pipe_cfg->ents[link->sink_ent].ved; > > ret = media_create_pad_link(ved_src->ent, link->src_pad, > ved_sink->ent, link->sink_pad, > @@ -163,13 +145,28 @@ static int vimc_create_links(struct vimc_device *vimc) > return 0; > } > > -static int vimc_comp_bind(struct device *master) > +static int vimc_add_subdevs(struct vimc_device *vimc) > { > - struct vimc_device *vimc = container_of(to_platform_device(master), > - struct vimc_device, pdev); > + unsigned int i; > int ret; > > - dev_dbg(master, "bind"); > + for (i = 0; i < vimc->pipe_cfg->num_ents; i++) { > + dev_dbg(&vimc->pdev.dev, "new entity for %s\n", > + vimc->pipe_cfg->ents[i].name); > + ret = vimc->pipe_cfg->ents[i].add(vimc, > + &vimc->pipe_cfg->ents[i]); > + if (ret) { > + dev_err(&vimc->pdev.dev, "add new entity for %s\n", > + vimc->pipe_cfg->ents[i].name); > + return ret; > + } If this fails, I think we should remove the subdevs that were added. > + } > + return 0; > +} > + > +static int vimc_register_devices(struct vimc_device *vimc) > +{ > + int ret; > > /* Register the v4l2 struct */ > ret = v4l2_device_register(vimc->mdev.dev, &vimc->v4l2_dev); > @@ -179,22 +176,20 @@ static int vimc_comp_bind(struct device *master) > return ret; > } > > - /* Bind subdevices */ > - ret = component_bind_all(master, &vimc->v4l2_dev); > - if (ret) > - goto err_v4l2_unregister; > + /* Invoke entity config hooks to initialize and register subdevs */ > + vimc_add_subdevs(vimc); The return value should be checked here as well. > > /* Initialize links */ > ret = vimc_create_links(vimc); > if (ret) > - goto err_comp_unbind_all; > + goto err_v4l2_unregister; > > /* Register the media device */ > ret = media_device_register(&vimc->mdev); > if (ret) { > dev_err(vimc->mdev.dev, > "media device register failed (err=%d)\n", ret); > - goto err_comp_unbind_all; > + goto err_v4l2_unregister; > } > > /* Expose all subdev's nodes*/ > @@ -211,98 +206,36 @@ static int vimc_comp_bind(struct device *master) > err_mdev_unregister: > media_device_unregister(&vimc->mdev); > media_device_cleanup(&vimc->mdev); > -err_comp_unbind_all: > - component_unbind_all(master, NULL); > err_v4l2_unregister: > v4l2_device_unregister(&vimc->v4l2_dev); > > return ret; > } > > -static void vimc_comp_unbind(struct device *master) > +static void vimc_unregister(struct vimc_device *vimc) > { > - struct vimc_device *vimc = container_of(to_platform_device(master), > - struct vimc_device, pdev); > - > - dev_dbg(master, "unbind"); > - > media_device_unregister(&vimc->mdev); > media_device_cleanup(&vimc->mdev); > - component_unbind_all(master, NULL); > v4l2_device_unregister(&vimc->v4l2_dev); > } > > -static int vimc_comp_compare(struct device *comp, void *data) > -{ > - return comp == data; > -} > - > -static struct component_match *vimc_add_subdevs(struct vimc_device *vimc) > -{ > - struct component_match *match = NULL; > - struct vimc_platform_data pdata; > - int i; > - > - for (i = 0; i < vimc->pipe_cfg->num_ents; i++) { > - dev_dbg(&vimc->pdev.dev, "new pdev for %s\n", > - vimc->pipe_cfg->ents[i].drv); > - > - strscpy(pdata.entity_name, vimc->pipe_cfg->ents[i].name, > - sizeof(pdata.entity_name)); > - > - vimc->subdevs[i] = platform_device_register_data(&vimc->pdev.dev, > - vimc->pipe_cfg->ents[i].drv, > - PLATFORM_DEVID_AUTO, > - &pdata, > - sizeof(pdata)); > - if (IS_ERR(vimc->subdevs[i])) { > - match = ERR_CAST(vimc->subdevs[i]); > - while (--i >= 0) > - platform_device_unregister(vimc->subdevs[i]); > - > - return match; > - } > - > - component_match_add(&vimc->pdev.dev, &match, vimc_comp_compare, > - &vimc->subdevs[i]->dev); > - } > - > - return match; > -} > - > static void vimc_rm_subdevs(struct vimc_device *vimc) > { > unsigned int i; > > for (i = 0; i < vimc->pipe_cfg->num_ents; i++) > - platform_device_unregister(vimc->subdevs[i]); > + vimc->pipe_cfg->ents[i].rm(vimc, &vimc->pipe_cfg->ents[i]); > } > > -static const struct component_master_ops vimc_comp_ops = { > - .bind = vimc_comp_bind, > - .unbind = vimc_comp_unbind, > -}; > - > static int vimc_probe(struct platform_device *pdev) > { > struct vimc_device *vimc = container_of(pdev, struct vimc_device, pdev); > - struct component_match *match = NULL; > - int ret; > + int ret = 0; no need to init to zero > > dev_dbg(&pdev->dev, "probe"); > > memset(&vimc->mdev, 0, sizeof(vimc->mdev)); > > - /* Create platform_device for each entity in the topology*/ > - vimc->subdevs = devm_kcalloc(&vimc->pdev.dev, vimc->pipe_cfg->num_ents, > - sizeof(*vimc->subdevs), GFP_KERNEL); > - if (!vimc->subdevs) > - return -ENOMEM; > - > - match = vimc_add_subdevs(vimc); > - if (IS_ERR(match)) > - return PTR_ERR(match); > - > /* Link the media device within the v4l2_device */ > vimc->v4l2_dev.mdev = &vimc->mdev; > > @@ -314,16 +247,11 @@ static int vimc_probe(struct platform_device *pdev) > vimc->mdev.dev = &pdev->dev; > media_device_init(&vimc->mdev); > > - /* Add self to the component system */ > - ret = component_master_add_with_match(&pdev->dev, &vimc_comp_ops, > - match); > - if (ret) { > + ret = vimc_register_devices(vimc); > + if (ret) > media_device_cleanup(&vimc->mdev); > - vimc_rm_subdevs(vimc); > - return ret; > - } > > - return 0; > + return ret; I would leave the return 0 make it clear this is the success case. Thanks Helen > } > > static int vimc_remove(struct platform_device *pdev) > @@ -332,8 +260,8 @@ static int vimc_remove(struct platform_device *pdev) > > dev_dbg(&pdev->dev, "remove"); > > - component_master_del(&pdev->dev, &vimc_comp_ops); > vimc_rm_subdevs(vimc); > + vimc_unregister(vimc); > > return 0; > } > diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c > index 00598fbf3cba..3b4e73c10a03 100644 > --- a/drivers/media/platform/vimc/vimc-debayer.c > +++ b/drivers/media/platform/vimc/vimc-debayer.c > @@ -5,19 +5,14 @@ > * Copyright (C) 2015-2017 Helen Koike > */ > > -#include > #include > -#include > -#include > #include > #include > #include > > #include "vimc-common.h" > > -#define VIMC_DEB_DRV_NAME "vimc-debayer" > -/* This module only supports transforming a bayer format > - * to V4L2_PIX_FMT_RGB24 > +/* Supports transforming a bayer format to V4L2_PIX_FMT_RGB24 > */ > #define VIMC_DEB_SRC_PIXFMT V4L2_PIX_FMT_RGB24 > #define VIMC_DEB_SRC_MBUS_FMT_DEFAULT MEDIA_BUS_FMT_RGB888_1X24 > @@ -513,21 +508,19 @@ static const struct v4l2_subdev_internal_ops vimc_deb_int_ops = { > .release = vimc_deb_release, > }; > > -static void vimc_deb_comp_unbind(struct device *comp, struct device *master, > - void *master_data) > +void vimc_deb_rm(struct vimc_device *vimc, struct vimc_ent_config *vent) > { > - struct vimc_ent_device *ved = dev_get_drvdata(comp); > - struct vimc_deb_device *vdeb = container_of(ved, struct vimc_deb_device, > + struct vimc_ent_device *ved = vent->ved; > + struct vimc_deb_device *vdeb = container_of(ved, > + struct vimc_deb_device, > ved); > > vimc_ent_sd_unregister(ved, &vdeb->sd); > } > > -static int vimc_deb_comp_bind(struct device *comp, struct device *master, > - void *master_data) > +int vimc_deb_add(struct vimc_device *vimc, struct vimc_ent_config *vent) > { > - struct v4l2_device *v4l2_dev = master_data; > - struct vimc_platform_data *pdata = comp->platform_data; > + struct v4l2_device *v4l2_dev = &vimc->v4l2_dev; > struct vimc_deb_device *vdeb; > int ret; > > @@ -538,7 +531,7 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master, > > /* Initialize ved and sd */ > ret = vimc_ent_sd_register(&vdeb->ved, &vdeb->sd, v4l2_dev, > - pdata->entity_name, > + vent->name, > MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV, 2, > (const unsigned long[2]) {MEDIA_PAD_FL_SINK, > MEDIA_PAD_FL_SOURCE}, > @@ -549,8 +542,7 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master, > } > > vdeb->ved.process_frame = vimc_deb_process_frame; > - dev_set_drvdata(comp, &vdeb->ved); > - vdeb->dev = comp; > + vdeb->dev = &vimc->pdev.dev; > > /* Initialize the frame format */ > vdeb->sink_fmt = sink_fmt_default; > @@ -563,46 +555,6 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master, > */ > vdeb->set_rgb_src = vimc_deb_set_rgb_pix_rgb24; > > + vent->ved = &vdeb->ved; > return 0; > } > - > -static const struct component_ops vimc_deb_comp_ops = { > - .bind = vimc_deb_comp_bind, > - .unbind = vimc_deb_comp_unbind, > -}; > - > -static int vimc_deb_probe(struct platform_device *pdev) > -{ > - return component_add(&pdev->dev, &vimc_deb_comp_ops); > -} > - > -static int vimc_deb_remove(struct platform_device *pdev) > -{ > - component_del(&pdev->dev, &vimc_deb_comp_ops); > - > - return 0; > -} > - > -static const struct platform_device_id vimc_deb_driver_ids[] = { > - { > - .name = VIMC_DEB_DRV_NAME, > - }, > - { } > -}; > - > -static struct platform_driver vimc_deb_pdrv = { > - .probe = vimc_deb_probe, > - .remove = vimc_deb_remove, > - .id_table = vimc_deb_driver_ids, > - .driver = { > - .name = VIMC_DEB_DRV_NAME, > - }, > -}; > - > -module_platform_driver(vimc_deb_pdrv); > - > -MODULE_DEVICE_TABLE(platform, vimc_deb_driver_ids); > - > -MODULE_DESCRIPTION("Virtual Media Controller Driver (VIMC) Debayer"); > -MODULE_AUTHOR("Helen Mae Koike Fornazier "); > -MODULE_LICENSE("GPL"); > diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c > index c7123a45c55b..cb5eb42de69d 100644 > --- a/drivers/media/platform/vimc/vimc-scaler.c > +++ b/drivers/media/platform/vimc/vimc-scaler.c > @@ -5,18 +5,13 @@ > * Copyright (C) 2015-2017 Helen Koike > */ > > -#include > #include > -#include > -#include > #include > #include > #include > > #include "vimc-common.h" > > -#define VIMC_SCA_DRV_NAME "vimc-scaler" > - > static unsigned int sca_mult = 3; > module_param(sca_mult, uint, 0000); > MODULE_PARM_DESC(sca_mult, " the image size multiplier"); > @@ -344,22 +339,21 @@ static const struct v4l2_subdev_internal_ops vimc_sca_int_ops = { > .release = vimc_sca_release, > }; > > -static void vimc_sca_comp_unbind(struct device *comp, struct device *master, > - void *master_data) > +void vimc_sca_rm(struct vimc_device *vimc, struct vimc_ent_config *vent) > { > - struct vimc_ent_device *ved = dev_get_drvdata(comp); > - struct vimc_sca_device *vsca = container_of(ved, struct vimc_sca_device, > + struct vimc_ent_device *ved = vent->ved; > + struct vimc_sca_device *vsca = container_of(ved, > + struct vimc_sca_device, > ved); > > + > vimc_ent_sd_unregister(ved, &vsca->sd); > } > > > -static int vimc_sca_comp_bind(struct device *comp, struct device *master, > - void *master_data) > +int vimc_sca_add(struct vimc_device *vimc, struct vimc_ent_config *vent) > { > - struct v4l2_device *v4l2_dev = master_data; > - struct vimc_platform_data *pdata = comp->platform_data; > + struct v4l2_device *v4l2_dev = &vimc->v4l2_dev; > struct vimc_sca_device *vsca; > int ret; > > @@ -370,7 +364,7 @@ static int vimc_sca_comp_bind(struct device *comp, struct device *master, > > /* Initialize ved and sd */ > ret = vimc_ent_sd_register(&vsca->ved, &vsca->sd, v4l2_dev, > - pdata->entity_name, > + vent->name, > MEDIA_ENT_F_PROC_VIDEO_SCALER, 2, > (const unsigned long[2]) {MEDIA_PAD_FL_SINK, > MEDIA_PAD_FL_SOURCE}, > @@ -381,52 +375,12 @@ static int vimc_sca_comp_bind(struct device *comp, struct device *master, > } > > vsca->ved.process_frame = vimc_sca_process_frame; > - dev_set_drvdata(comp, &vsca->ved); > - vsca->dev = comp; > + vsca->dev = &vimc->pdev.dev; > + > + vent->ved = &vsca->ved; > > /* Initialize the frame format */ > vsca->sink_fmt = sink_fmt_default; > > return 0; > } > - > -static const struct component_ops vimc_sca_comp_ops = { > - .bind = vimc_sca_comp_bind, > - .unbind = vimc_sca_comp_unbind, > -}; > - > -static int vimc_sca_probe(struct platform_device *pdev) > -{ > - return component_add(&pdev->dev, &vimc_sca_comp_ops); > -} > - > -static int vimc_sca_remove(struct platform_device *pdev) > -{ > - component_del(&pdev->dev, &vimc_sca_comp_ops); > - > - return 0; > -} > - > -static const struct platform_device_id vimc_sca_driver_ids[] = { > - { > - .name = VIMC_SCA_DRV_NAME, > - }, > - { } > -}; > - > -static struct platform_driver vimc_sca_pdrv = { > - .probe = vimc_sca_probe, > - .remove = vimc_sca_remove, > - .id_table = vimc_sca_driver_ids, > - .driver = { > - .name = VIMC_SCA_DRV_NAME, > - }, > -}; > - > -module_platform_driver(vimc_sca_pdrv); > - > -MODULE_DEVICE_TABLE(platform, vimc_sca_driver_ids); > - > -MODULE_DESCRIPTION("Virtual Media Controller Driver (VIMC) Scaler"); > -MODULE_AUTHOR("Helen Mae Koike Fornazier "); > -MODULE_LICENSE("GPL"); > diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c > index 51359472eef2..70b195b817a4 100644 > --- a/drivers/media/platform/vimc/vimc-sensor.c > +++ b/drivers/media/platform/vimc/vimc-sensor.c > @@ -5,10 +5,6 @@ > * Copyright (C) 2015-2017 Helen Koike > */ > > -#include > -#include > -#include > -#include > #include > #include > #include > @@ -18,8 +14,6 @@ > > #include "vimc-common.h" > > -#define VIMC_SEN_DRV_NAME "vimc-sensor" > - > struct vimc_sen_device { > struct vimc_ent_device ved; > struct v4l2_subdev sd; > @@ -279,12 +273,12 @@ static const struct v4l2_subdev_internal_ops vimc_sen_int_ops = { > .release = vimc_sen_release, > }; > > -static void vimc_sen_comp_unbind(struct device *comp, struct device *master, > - void *master_data) > +void vimc_sen_rm(struct vimc_device *vimc, struct vimc_ent_config *vent) > { > - struct vimc_ent_device *ved = dev_get_drvdata(comp); > - struct vimc_sen_device *vsen = > - container_of(ved, struct vimc_sen_device, ved); > + struct vimc_ent_device *ved = vent->ved; > + struct vimc_sen_device *vsen = container_of(ved, > + struct vimc_sen_device, > + ved); > > vimc_ent_sd_unregister(ved, &vsen->sd); > } > @@ -306,11 +300,9 @@ static const struct v4l2_ctrl_config vimc_sen_ctrl_test_pattern = { > .qmenu = tpg_pattern_strings, > }; > > -static int vimc_sen_comp_bind(struct device *comp, struct device *master, > - void *master_data) > +int vimc_sen_add(struct vimc_device *vimc, struct vimc_ent_config *vent) > { > - struct v4l2_device *v4l2_dev = master_data; > - struct vimc_platform_data *pdata = comp->platform_data; > + struct v4l2_device *v4l2_dev = &vimc->v4l2_dev; > struct vimc_sen_device *vsen; > int ret; > > @@ -343,7 +335,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, > > /* Initialize ved and sd */ > ret = vimc_ent_sd_register(&vsen->ved, &vsen->sd, v4l2_dev, > - pdata->entity_name, > + vent->name, > MEDIA_ENT_F_CAM_SENSOR, 1, > (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE}, > &vimc_sen_int_ops, &vimc_sen_ops); > @@ -351,8 +343,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, > goto err_free_hdl; > > vsen->ved.process_frame = vimc_sen_process_frame; > - dev_set_drvdata(comp, &vsen->ved); > - vsen->dev = comp; > + vsen->dev = &vimc->pdev.dev; > > /* Initialize the frame format */ > vsen->mbus_format = fmt_default; > @@ -364,6 +355,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, > if (ret) > goto err_unregister_ent_sd; > > + vent->ved = &vsen->ved; > return 0; > > err_unregister_ent_sd: > @@ -375,44 +367,3 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, > > return ret; > } > - > -static const struct component_ops vimc_sen_comp_ops = { > - .bind = vimc_sen_comp_bind, > - .unbind = vimc_sen_comp_unbind, > -}; > - > -static int vimc_sen_probe(struct platform_device *pdev) > -{ > - return component_add(&pdev->dev, &vimc_sen_comp_ops); > -} > - > -static int vimc_sen_remove(struct platform_device *pdev) > -{ > - component_del(&pdev->dev, &vimc_sen_comp_ops); > - > - return 0; > -} > - > -static const struct platform_device_id vimc_sen_driver_ids[] = { > - { > - .name = VIMC_SEN_DRV_NAME, > - }, > - { } > -}; > - > -static struct platform_driver vimc_sen_pdrv = { > - .probe = vimc_sen_probe, > - .remove = vimc_sen_remove, > - .id_table = vimc_sen_driver_ids, > - .driver = { > - .name = VIMC_SEN_DRV_NAME, > - }, > -}; > - > -module_platform_driver(vimc_sen_pdrv); > - > -MODULE_DEVICE_TABLE(platform, vimc_sen_driver_ids); > - > -MODULE_DESCRIPTION("Virtual Media Controller Driver (VIMC) Sensor"); > -MODULE_AUTHOR("Helen Mae Koike Fornazier "); > -MODULE_LICENSE("GPL"); >