diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-09-03 16:12:16 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 17:37:35 -0400 |
commit | 012d6b029ec17f45374303bbdccd0bc206725751 (patch) | |
tree | 35f0613ea11178ac7d3ffc2a779460121e673287 /drivers/media/video/gspca/pac7311.c | |
parent | 66e4124f41808b50f6e1b6771621d6c7bf1c34a6 (diff) |
V4L/DVB (8822): gspca: Change some subdriver functions for suspend/resume.
- new function 'init' called on probe and resume
- remove the functions 'open' and 'closed'
- 'stopN' and 'stop0' are optional
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/pac7311.c')
-rw-r--r-- | drivers/media/video/gspca/pac7311.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c index 69d610062d00..e22ca610334f 100644 --- a/drivers/media/video/gspca/pac7311.c +++ b/drivers/media/video/gspca/pac7311.c | |||
@@ -590,8 +590,8 @@ static void sethvflip(struct gspca_dev *gspca_dev) | |||
590 | reg_w(gspca_dev, 0x11, 0x01); | 590 | reg_w(gspca_dev, 0x11, 0x01); |
591 | } | 591 | } |
592 | 592 | ||
593 | /* this function is called at open time */ | 593 | /* this function is called at probe and resume time */ |
594 | static int sd_open(struct gspca_dev *gspca_dev) | 594 | static int sd_init(struct gspca_dev *gspca_dev) |
595 | { | 595 | { |
596 | return 0; | 596 | return 0; |
597 | } | 597 | } |
@@ -691,11 +691,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
691 | } | 691 | } |
692 | } | 692 | } |
693 | 693 | ||
694 | /* this function is called at close time */ | ||
695 | static void sd_close(struct gspca_dev *gspca_dev) | ||
696 | { | ||
697 | } | ||
698 | |||
699 | static void do_autogain(struct gspca_dev *gspca_dev) | 694 | static void do_autogain(struct gspca_dev *gspca_dev) |
700 | { | 695 | { |
701 | } | 696 | } |
@@ -902,11 +897,10 @@ static struct sd_desc sd_desc = { | |||
902 | .ctrls = sd_ctrls, | 897 | .ctrls = sd_ctrls, |
903 | .nctrls = ARRAY_SIZE(sd_ctrls), | 898 | .nctrls = ARRAY_SIZE(sd_ctrls), |
904 | .config = sd_config, | 899 | .config = sd_config, |
905 | .open = sd_open, | 900 | .init = sd_init, |
906 | .start = sd_start, | 901 | .start = sd_start, |
907 | .stopN = sd_stopN, | 902 | .stopN = sd_stopN, |
908 | .stop0 = sd_stop0, | 903 | .stop0 = sd_stop0, |
909 | .close = sd_close, | ||
910 | .pkt_scan = sd_pkt_scan, | 904 | .pkt_scan = sd_pkt_scan, |
911 | .dq_callback = do_autogain, | 905 | .dq_callback = do_autogain, |
912 | }; | 906 | }; |