From patchwork Sat Oct 31 23:14:40 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: 1921 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Sat, 31 Oct 2009 23:14:47 +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:49 -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 1N4N9i-0002BA-QL; Sat, 31 Oct 2009 23:14:47 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933366AbZJaXOk (ORCPT + 1 other); Sat, 31 Oct 2009 19:14:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933364AbZJaXOk (ORCPT ); Sat, 31 Oct 2009 19:14:40 -0400 Received: from mail02d.mail.t-online.hu ([84.2.42.7]:52372 "EHLO mail02d.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933316AbZJaXOk (ORCPT ); Sat, 31 Oct 2009 19:14:40 -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 mail02d.mail.t-online.hu (Postfix) with ESMTPSA id F3CE075861E; Sun, 1 Nov 2009 00:14:35 +0100 (CET) Message-ID: <4AECC4E0.8090006@freemail.hu> Date: Sun, 01 Nov 2009 00:14:40 +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 08/21] gspca pac7302/pac7311: separate stop0 X-DCC-mail.t-online.hu-Metrics: mail02d.mail.t-online.hu 32721; 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 stop0 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 h/drivers/media/video/gspca/pac7311.c i/drivers/media/video/gspca/pac7311.c --- h/drivers/media/video/gspca/pac7311.c 2009-10-30 18:01:57.000000000 +0100 +++ i/drivers/media/video/gspca/pac7311.c 2009-10-30 17:59:39.000000000 +0100 @@ -803,17 +803,18 @@ static void pac7311_sd_stopN(struct gspc reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */ } -/* called on streamoff with alt 0 and on disconnect */ -static void sd_stop0(struct gspca_dev *gspca_dev) +/* called on streamoff with alt 0 and on disconnect for pac7302 */ +static void pac7302_sd_stop0(struct gspca_dev *gspca_dev) { - struct sd *sd = (struct sd *) gspca_dev; - if (!gspca_dev->present) return; - if (sd->sensor == SENSOR_PAC7302) { - reg_w(gspca_dev, 0xff, 0x01); - reg_w(gspca_dev, 0x78, 0x40); - } + reg_w(gspca_dev, 0xff, 0x01); + reg_w(gspca_dev, 0x78, 0x40); +} + +/* called on streamoff with alt 0 and on disconnect for 7311 */ +static void pac7311_sd_stop0(struct gspca_dev *gspca_dev) +{ } /* Include pac common sof detection functions */ @@ -1177,7 +1178,7 @@ static struct sd_desc pac7302_sd_desc = .init = pac7302_sd_init, .start = pac7302_sd_start, .stopN = pac7302_sd_stopN, - .stop0 = sd_stop0, + .stop0 = pac7302_sd_stop0, .pkt_scan = pac7302_sd_pkt_scan, .dq_callback = do_autogain, }; @@ -1191,7 +1192,7 @@ static struct sd_desc pac7311_sd_desc = .init = pac7311_sd_init, .start = pac7311_sd_start, .stopN = pac7311_sd_stopN, - .stop0 = sd_stop0, + .stop0 = pac7311_sd_stop0, .pkt_scan = pac7311_sd_pkt_scan, .dq_callback = do_autogain, };