From patchwork Fri Sep 24 14:14:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 204772 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8OEF4Wu010324 for ; Fri, 24 Sep 2010 14:15:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932313Ab0IXOPD (ORCPT ); Fri, 24 Sep 2010 10:15:03 -0400 Received: from perceval.irobotique.be ([92.243.18.41]:60404 "EHLO perceval.irobotique.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932311Ab0IXOOk (ORCPT ); Fri, 24 Sep 2010 10:14:40 -0400 Received: from localhost.localdomain (unknown [91.178.47.217]) by perceval.irobotique.be (Postfix) with ESMTPSA id 8D41C35DAE; Fri, 24 Sep 2010 14:14:38 +0000 (UTC) From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Hans Verkuil , Jean Delvare , Guennadi Liakhovetski , Pete Eberlein , Mike Isely , Eduardo Valentin , Andy Walls , Vaibhav Hiremath , Muralidharan Karicheri Subject: [PATCH 07/16] pvrusb2: Don't use module names to load I2C modules Date: Fri, 24 Sep 2010 16:14:05 +0200 Message-Id: <1285337654-5044-8-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1285337654-5044-1-git-send-email-laurent.pinchart@ideasonboard.com> References: <1285337654-5044-1-git-send-email-laurent.pinchart@ideasonboard.com> 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.3 (demeter1.kernel.org [140.211.167.41]); Fri, 24 Sep 2010 14:15:12 +0000 (UTC) diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 70ea578..bef2027 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -2082,20 +2082,13 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw, return -EINVAL; } - /* Note how the 2nd and 3rd arguments are the same for - * v4l2_i2c_new_subdev(). Why? - * Well the 2nd argument is the module name to load, while the 3rd - * argument is documented in the framework as being the "chipid" - - * and every other place where I can find examples of this, the - * "chipid" appears to just be the module name again. So here we - * just do the same thing. */ if (i2ccnt == 1) { pvr2_trace(PVR2_TRACE_INIT, "Module ID %u:" " Setting up with specified i2c address 0x%x", mid, i2caddr[0]); sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap, - fname, fname, + NULL, fname, i2caddr[0], NULL); } else { pvr2_trace(PVR2_TRACE_INIT, @@ -2103,7 +2096,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw, " Setting up with address probe list", mid); sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap, - fname, fname, + NULL, fname, 0, i2caddr); }