From patchwork Sat Oct 31 23:14:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOpbWV0aCBNw6FydG9u?= X-Patchwork-Id: 1918 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Sat, 31 Oct 2009 23:14:14 +0000 Received: from bombadil.infradead.org [18.85.46.34] by caramujo.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Sat, 31 Oct 2009 21:14:44 -0200 (BRST) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1N4N9B-0002BA-QS; Sat, 31 Oct 2009 23:14:14 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933357AbZJaXOH (ORCPT + 1 other); Sat, 31 Oct 2009 19:14:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933349AbZJaXOH (ORCPT ); Sat, 31 Oct 2009 19:14:07 -0400 Received: from mail01d.mail.t-online.hu ([84.2.42.6]:64963 "EHLO mail01d.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933303AbZJaXOG (ORCPT ); Sat, 31 Oct 2009 19:14:06 -0400 X-Authuid: nmarci Received: from [192.168.1.64] (dsl5402C4D0.pool.t-online.hu [84.2.196.208]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail01d.mail.t-online.hu (Postfix) with ESMTPSA id E1F2B7585F9; Sun, 1 Nov 2009 00:13:59 +0100 (CET) Message-ID: <4AECC4BD.4000700@freemail.hu> Date: Sun, 01 Nov 2009 00:14:05 +0100 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 To: Jean-Francois Moine , Hans de Goede , V4L Mailing List CC: Thomas Kaiser , Theodore Kilgore , Kyle Guinn Subject: [PATCH 05/21] gspca pac7302/pac7311: separate init X-DCC-mail.t-online.hu-Metrics: mail01d.mail.t-online.hu 32711; Body=6 Fuz1=6 Fuz2=6 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Márton Németh Separate the init function. Remove the run-time decision for PAC7302 and PAC7311 sensors. Signed-off-by: Márton Németh Cc: Thomas Kaiser Cc: Theodore Kilgore Cc: Kyle Guinn --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -uprN e/drivers/media/video/gspca/pac7311.c f/drivers/media/video/gspca/pac7311.c --- e/drivers/media/video/gspca/pac7311.c 2009-10-30 17:27:57.000000000 +0100 +++ f/drivers/media/video/gspca/pac7311.c 2009-10-30 18:04:30.000000000 +0100 @@ -698,15 +698,18 @@ static void sethvflip(struct gspca_dev * reg_w(gspca_dev, 0x11, 0x01); } -/* this function is called at probe and resume time */ -static int sd_init(struct gspca_dev *gspca_dev) +/* this function is called at probe and resume time for pac7302 */ +static int pac7302_sd_init(struct gspca_dev *gspca_dev) { - struct sd *sd = (struct sd *) gspca_dev; + reg_w_seq(gspca_dev, init_7302, sizeof init_7302); - if (sd->sensor == SENSOR_PAC7302) - reg_w_seq(gspca_dev, init_7302, sizeof init_7302); - else - reg_w_seq(gspca_dev, init_7311, sizeof init_7311); + return 0; +} + +/* this function is called at probe and resume time for pac7311 */ +static int pac7311_sd_init(struct gspca_dev *gspca_dev) +{ + reg_w_seq(gspca_dev, init_7311, sizeof init_7311); return 0; } @@ -1156,7 +1159,7 @@ static struct sd_desc pac7302_sd_desc = .ctrls = sd_ctrls, .nctrls = ARRAY_SIZE(sd_ctrls), .config = pac7302_sd_config, - .init = sd_init, + .init = pac7302_sd_init, .start = sd_start, .stopN = sd_stopN, .stop0 = sd_stop0, @@ -1170,7 +1173,7 @@ static struct sd_desc pac7311_sd_desc = .ctrls = sd_ctrls, .nctrls = ARRAY_SIZE(sd_ctrls), .config = pac7311_sd_config, - .init = sd_init, + .init = pac7311_sd_init, .start = sd_start, .stopN = sd_stopN, .stop0 = sd_stop0,