gspca pac7302/pac7311: separate stop0
PATCH 8/21 gspca pac7302/pac7311: separate stop0
From: Márton Németh <[email protected]>
Separate the stop0 function. Remove the run-time decision for PAC7302 and PAC7311 sensors.
Signed-off-by Márton Németh <[email protected]>
Cc Thomas Kaiser <[email protected]>
Cc Theodore Kilgore <[email protected]>
Cc Kyle Guinn <[email protected]>
---
drivers/media/video/gspca/pac7311.c +11 -10
@@ -803,17 +803,18 @@ static void pac7311_sd_stopN(struct gspcreg_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, };