From patchwork Sat Jul 16 00:13:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 981012 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6G0E2im015870 for ; Sat, 16 Jul 2011 00:14:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751502Ab1GPAOA (ORCPT ); Fri, 15 Jul 2011 20:14:00 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:64733 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750934Ab1GPAN7 (ORCPT ); Fri, 15 Jul 2011 20:13:59 -0400 Received: from axis700.grange (dslb-178-001-145-049.pools.arcor-ip.net [178.1.145.49]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MCqF1-1QZw2P3PWN-009lCO; Sat, 16 Jul 2011 02:13:58 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 8F0D3189B6E; Sat, 16 Jul 2011 02:13:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 7C27A189B6D for ; Sat, 16 Jul 2011 02:13:58 +0200 (CEST) Date: Sat, 16 Jul 2011 02:13:58 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List Subject: [PATCH 5/6] V4L: soc-camera: un-export the soc-camera bus In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:47at2P2EwUaZgY+asR3LDh8PoiXVj71f01w2RlY48rW MFatFvdT34j8taS7AVptuMOLG8NWxeuJktdxe6tuPFDZAxVziB cRF8Alcj8faJeWlwSGwRgMCemnLWAftt9n35F9pezekqsmeM9O k6bU8UZLY9C6MraLYim6DxboKdkzHymvdxL34IlPZGXgkrwy2s TWBunvKyNeMGZ6JoFFafk+zG3B8ccMf+EBrpldvayc= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sat, 16 Jul 2011 00:14:02 +0000 (UTC) The soc-camera bus is now completely local again. Signed-off-by: Guennadi Liakhovetski --- drivers/media/video/soc_camera.c | 3 +-- include/media/soc_camera.h | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 96bed29..0df31b5 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -1207,12 +1207,11 @@ static int soc_camera_remove(struct device *dev) return 0; } -struct bus_type soc_camera_bus_type = { +static struct bus_type soc_camera_bus_type = { .name = "soc-camera", .probe = soc_camera_probe, .remove = soc_camera_remove, }; -EXPORT_SYMBOL_GPL(soc_camera_bus_type); static struct device_driver ic_drv = { .name = "camera", diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 70c4ea5..c31d55b 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -20,12 +20,10 @@ #include #include -extern struct bus_type soc_camera_bus_type; - struct file; struct soc_camera_device { - struct list_head list; + struct list_head list; /* list of all registered devices */ struct device dev; struct device *pdev; /* Platform device */ s32 user_width; @@ -126,8 +124,8 @@ struct soc_camera_link { int num_regulators; /* - * For non-I2C devices platform platform has to provide methods to - * add a device to the system and to remove + * For non-I2C devices platform has to provide methods to add a device + * to the system and to remove it */ int (*add_device)(struct soc_camera_link *, struct device *); void (*del_device)(struct soc_camera_link *);