From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754645Ab3EZP7L (ORCPT ); Sun, 26 May 2013 11:59:11 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:48137 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754510Ab3EZP7I (ORCPT ); Sun, 26 May 2013 11:59:08 -0400 From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu Cc: Jiang Liu , "Rafael J . Wysocki" , Greg Kroah-Hartman , Gu Zheng , Toshi Kani , Myron Stowe , Yijing Wang , Jiang Liu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Daniel Drake , Jonathan Corbet , Javier Martin , linux-media@vger.kernel.org Subject: [PATCH v3, part2 16/20] PCI, via-camera: use hotplug-safe iterators to walk PCI buses Date: Sun, 26 May 2013 23:53:13 +0800 Message-Id: <1369583597-3801-17-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> References: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Enhance via-camera drviers to use hotplug-safe iterators to walk PCI buses. Signed-off-by: Jiang Liu Cc: Mauro Carvalho Chehab Cc: Daniel Drake Cc: Jonathan Corbet Cc: Javier Martin Cc: linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/media/platform/via-camera.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c index a794cd6..3ea3fac 100644 --- a/drivers/media/platform/via-camera.c +++ b/drivers/media/platform/via-camera.c @@ -1284,7 +1284,8 @@ static struct video_device viacam_v4l_template = { static bool viacam_serial_is_enabled(void) { - struct pci_bus *pbus = pci_find_bus(0, 0); + struct pci_bus *pbus = pci_get_bus(0, 0); + bool ret = false; u8 cbyte; if (!pbus) @@ -1292,18 +1293,21 @@ static bool viacam_serial_is_enabled(void) pci_bus_read_config_byte(pbus, VIACAM_SERIAL_DEVFN, VIACAM_SERIAL_CREG, &cbyte); if ((cbyte & VIACAM_SERIAL_BIT) == 0) - return false; /* Not enabled */ + goto out; /* Not enabled */ if (override_serial == 0) { printk(KERN_NOTICE "Via camera: serial port is enabled, " \ "refusing to load.\n"); printk(KERN_NOTICE "Specify override_serial=1 to force " \ "module loading.\n"); - return true; + ret = true; + goto out; } printk(KERN_NOTICE "Via camera: overriding serial port\n"); pci_bus_write_config_byte(pbus, VIACAM_SERIAL_DEVFN, VIACAM_SERIAL_CREG, cbyte & ~VIACAM_SERIAL_BIT); - return false; +out: + pci_bus_put(pbus); + return ret; } static struct ov7670_config sensor_cfg = { -- 1.8.1.2