gspca pac7302/pac7311: separate init
PATCH 5/21 gspca pac7302/pac7311: separate init
From: Márton Németh <[email protected]>
Separate the init 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 +12 -9
@@ -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,