Skip to content

Commit

Permalink
[media] gspca: Add reset_resume callback to all sub-drivers
Browse files Browse the repository at this point in the history
1) The gspca-core's suspend/resume code is such that resume being called after
a reset is safe / ok.

2) All devices tested sofar seem to need the reset_resume callback to work
properly over a suspend

3) The USB-core won't call the reset_resume callback for devices which don't
need it

Thus it seems the simplest and the best to just add the callback to all
sub-drivers, rather then adding the callbacks one-by-one as each driver gets
tested with suspend/resume.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Jul 30, 2012
1 parent 1289179 commit 8bb5896
Show file tree
Hide file tree
Showing 41 changed files with 41 additions and 2 deletions.
1 change: 1 addition & 0 deletions drivers/media/video/gspca/benq.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/conex.c
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/cpia1.c
Original file line number Diff line number Diff line change
Expand Up @@ -1898,6 +1898,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/etoms.c
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/finepix.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/gl860/gl860.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/jeilinj.c
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
3 changes: 1 addition & 2 deletions drivers/media/video/gspca/jl2005bcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -505,8 +505,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
/* sub-driver description */
static const struct sd_desc sd_desc = {
.name = MODULE_NAME,
/* .ctrls = none have been detected */
/* .nctrls = ARRAY_SIZE(sd_ctrls), */
.config = sd_config,
.init = sd_init,
.start = sd_start,
Expand Down Expand Up @@ -536,6 +534,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/kinect.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/konica.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/m5602/m5602_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
.disconnect = m5602_disconnect
};
Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/mr97310a.c
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/nw80x.c
Original file line number Diff line number Diff line change
Expand Up @@ -2087,6 +2087,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/ov519.c
Original file line number Diff line number Diff line change
Expand Up @@ -4981,6 +4981,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/ov534.c
Original file line number Diff line number Diff line change
Expand Up @@ -1537,6 +1537,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/ov534_9.c
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/pac207.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/pac7302.c
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/pac7311.c
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/se401.c
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
.pre_reset = sd_pre_reset,
.post_reset = sd_post_reset,
Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/sn9c2028.c
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/sonixb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1486,6 +1486,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/sonixj.c
Original file line number Diff line number Diff line change
Expand Up @@ -3199,6 +3199,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/spca1528.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/spca500.c
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/spca501.c
Original file line number Diff line number Diff line change
Expand Up @@ -2047,6 +2047,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/spca505.c
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/spca506.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/spca508.c
Original file line number Diff line number Diff line change
Expand Up @@ -1533,6 +1533,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/spca561.c
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/sq905.c
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/sq905c.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/sq930x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/stk014.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/stv0680.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/sunplus.c
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/t613.c
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/tv8532.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/vc032x.c
Original file line number Diff line number Diff line change
Expand Up @@ -3846,6 +3846,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/vicam.c
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down
1 change: 1 addition & 0 deletions drivers/media/video/gspca/xirlink_cit.c
Original file line number Diff line number Diff line change
Expand Up @@ -3135,6 +3135,7 @@ static struct usb_driver sd_driver = {
#ifdef CONFIG_PM
.suspend = gspca_suspend,
.resume = gspca_resume,
.reset_resume = gspca_resume,
#endif
};

Expand Down

0 comments on commit 8bb5896

Please sign in to comment.