Bluetooth: Add missing reset_resume dev_pm_ops

PATCH In review Shuah Khan 2 participants 6 messages Apr 29, 2013 – May 21, 2013 Bluetooth drivers

Share & tools

Shuah Khan

author

2013-04-29 15:45 UTC #0 lore raw

PATCH 1/1 Bluetooth: Add missing reset_resume dev_pm_ops

QWRkIG1pc3NpbmcgcmVzZXRfcmVzdW1lIGRldl9wbV9vcHMuIE1pc3NpbmcgcmVzZXRfcmVzdW1l IHJlc3VsdHMgaW4gdGhlDQpmb2xsb3dpbmcgbWVzc2FnZSBhZnRlciBwb3dlciBtYW5hZ2VtZW50 IGRldmljZSB0ZXN0LiBUaGlzIGNoYW5nZSBzZXRzDQpyZXNldF9yZXN1bWUgdG8gYnR1c2JfcmVz dW1lKCkuDQoNClsgMjUwNi45MzYxMzRdIGJ0dXNiIDEtMS41OjEuMDogbm8gcmVzZXRfcmVzdW1l IGZvciBkcml2ZXIgYnR1c2I/DQpbIDI1MDYuOTM2MTM3XSBidHVzYiAxLTEuNToxLjE6IG5vIHJl c2V0X3Jlc3VtZSBmb3IgZHJpdmVyIGJ0dXNiPw0KDQpTaWduZWQtb2ZmLWJ5OiBTaHVhaCBLaGFu IDxzaHVhaC5raEBzYW1zdW5nLmNvbT4NCi0tLQ0KIGRyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMg fCAgICAxICsNCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKykNCg0KZGlmZiAtLWdpdCBh L2RyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMgYi9kcml2ZXJzL2JsdWV0b290aC9idHVzYi5jDQpp bmRleCAyY2M1Zjc3Li4xMWQ3MmRlIDEwMDY0NA0KLS0tIGEvZHJpdmVycy9ibHVldG9vdGgvYnR1 c2IuYw0KKysrIGIvZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYw0KQEAgLTEyMzAsNiArMTIzMCw3 IEBAIHN0YXRpYyBzdHJ1Y3QgdXNiX2RyaXZlciBidHVzYl9kcml2ZXIgPSB7DQogI2lmZGVmIENP TkZJR19QTQ0KIAkuc3VzcGVuZAk9IGJ0dXNiX3N1c3BlbmQsDQogCS5yZXN1bWUJCT0gYnR1c2Jf cmVzdW1lLA0KKwkucmVzZXRfcmVzdW1lCT0gYnR1c2JfcmVzdW1lLA0KICNlbmRpZg0KIAkuaWRf dGFibGUJPSBidHVzYl90YWJsZSwNCiAJLnN1cHBvcnRzX2F1dG9zdXNwZW5kID0gMSwNCi0tIA0K MS43LjEwLjQNCg0KDQo=

Gustavo Padovan

2013-05-20 23:08 UTC #1 lore raw

Hi Shuah,

Quoted 11 lines · Shuah Khan

Add missing reset_resume dev_pm_ops. Missing reset_resume results in the following message after power management device test. This change sets reset_resume to btusb_resume().
[ 2506.936134] btusb 1-1.5:1.0: no reset_resume for driver btusb?
[ 2506.936137] btusb 1-1.5:1.1: no reset_resume for driver btusb?
Signed-off-by Shuah Khan <[email protected]>
---
 drivers/bluetooth/btusb.c |    1 +
 1 file changed, 1 insertion(+)

This patch needs rebase on latest bluetooth-next. It doesn't apply anymore. Please re-send it.

Gustavo

Shuah Khan

author

2013-05-20 23:34 UTC #2 lore raw

T24gTW9uLCAyMDEzLTA1LTIwIGF0IDIwOjA4IC0wMzAwLCBHdXN0YXZvIFBhZG92YW4gd3JvdGU6 DQo+IEhpIFNodWFoLA0KPiANCj4gKiBTaHVhaCBLaGFuIDxzaHVhaC5raEBzYW1zdW5nLmNvbT4g WzIwMTMtMDQtMjkgMTU6NDU6MzQgKzAwMDBdOg0KPiANCj4gPiBBZGQgbWlzc2luZyByZXNldF9y ZXN1bWUgZGV2X3BtX29wcy4gTWlzc2luZyByZXNldF9yZXN1bWUgcmVzdWx0cyBpbiB0aGUNCj4g PiBmb2xsb3dpbmcgbWVzc2FnZSBhZnRlciBwb3dlciBtYW5hZ2VtZW50IGRldmljZSB0ZXN0LiBU aGlzIGNoYW5nZSBzZXRzDQo+ID4gcmVzZXRfcmVzdW1lIHRvIGJ0dXNiX3Jlc3VtZSgpLg0KPiA+ IA0KPiA+IFsgMjUwNi45MzYxMzRdIGJ0dXNiIDEtMS41OjEuMDogbm8gcmVzZXRfcmVzdW1lIGZv ciBkcml2ZXIgYnR1c2I/DQo+ID4gWyAyNTA2LjkzNjEzN10gYnR1c2IgMS0xLjU6MS4xOiBubyBy ZXNldF9yZXN1bWUgZm9yIGRyaXZlciBidHVzYj8NCj4gPiANCj4gPiBTaWduZWQtb2ZmLWJ5OiBT aHVhaCBLaGFuIDxzaHVhaC5raEBzYW1zdW5nLmNvbT4NCj4gPiAtLS0NCj4gPiAgZHJpdmVycy9i bHVldG9vdGgvYnR1c2IuYyB8ICAgIDEgKw0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp b24oKykNCj4gDQo+IFRoaXMgcGF0Y2ggbmVlZHMgcmViYXNlIG9uIGxhdGVzdCBibHVldG9vdGgt bmV4dC4gSXQgZG9lc24ndCBhcHBseSBhbnltb3JlLg0KPiBQbGVhc2UgcmUtc2VuZCBpdC4NCj4g DQo+IAlHdXN0YXZvDQoNCkhpIEd1c3Rhdm8sDQoNClllcy4gSSB3aWxsIHJlYmFzZSBhbmQgcmVz ZW5kIGl0IHlvdSBzaG9ydGx5Lg0KDQotLSBTaHVhaA0KDQpTaHVhaCBLaGFuLCBMaW51eCBLZXJu ZWwgRGV2ZWxvcGVyIC0gT3BlbiBTb3VyY2UgR3JvdXAgDQpTYW1zdW5nIFJlc2VhcmNoIEFtZXJp Y2EgKFNpbGljb24gVmFsbGV5KQ0Kc2h1YWgua2hAc2Ftc3VuZy5jb20gfCAoOTcwKSA2NzItMDY1 OA0KDQo=

Shuah Khan

author

2013-05-21 01:02 UTC #3 lore raw

PATCH 1/1 Bluetooth: Add missing reset_resume dev_pm_ops

QWRkIG1pc3NpbmcgcmVzZXRfcmVzdW1lIGRldl9wbV9vcHMuIE1pc3NpbmcgcmVzZXRfcmVzdW1l IHJlc3VsdHMgaW4gdGhlDQpmb2xsb3dpbmcgbWVzc2FnZSBhZnRlciBwb3dlciBtYW5hZ2VtZW50 IGRldmljZSB0ZXN0LiBUaGlzIGNoYW5nZSBzZXRzDQpyZXNldF9yZXN1bWUgdG8gYnR1c2JfcmVz dW1lKCkuDQoNClsgMjUwNi45MzYxMzRdIGJ0dXNiIDEtMS41OjEuMDogbm8gcmVzZXRfcmVzdW1l IGZvciBkcml2ZXIgYnR1c2I/DQpbIDI1MDYuOTM2MTM3XSBidHVzYiAxLTEuNToxLjE6IG5vIHJl c2V0X3Jlc3VtZSBmb3IgZHJpdmVyIGJ0dXNiPw0KDQpTaWduZWQtb2ZmLWJ5OiBTaHVhaCBLaGFu IDxzaHVhaC5raEBzYW1zdW5nLmNvbT4NCi0tLQ0KIGRyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMg fCAgICAxICsNCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKykNCg0KZGlmZiAtLWdpdCBh L2RyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMgYi9kcml2ZXJzL2JsdWV0b290aC9idHVzYi5jDQpp bmRleCA3YTdlNWY4Li4xZWI5MGMwIDEwMDY0NA0KLS0tIGEvZHJpdmVycy9ibHVldG9vdGgvYnR1 c2IuYw0KKysrIGIvZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYw0KQEAgLTE2MTYsNiArMTYxNiw3 IEBAIHN0YXRpYyBzdHJ1Y3QgdXNiX2RyaXZlciBidHVzYl9kcml2ZXIgPSB7DQogI2lmZGVmIENP TkZJR19QTQ0KIAkuc3VzcGVuZAk9IGJ0dXNiX3N1c3BlbmQsDQogCS5yZXN1bWUJCT0gYnR1c2Jf cmVzdW1lLA0KKwkucmVzZXRfcmVzdW1lCT0gYnR1c2JfcmVzdW1lLA0KICNlbmRpZg0KIAkuaWRf dGFibGUJPSBidHVzYl90YWJsZSwNCiAJLnN1cHBvcnRzX2F1dG9zdXNwZW5kID0gMSwNCi0tIA0K MS43LjEwLjQNCg0KDQo=

Gustavo Padovan

2013-05-21 03:28 UTC #4 lore raw

Hi Shuan,

Quoted 17 lines · Shuah Khan

Add missing reset_resume dev_pm_ops. Missing reset_resume results in the following message after power management device test. This change sets reset_resume to btusb_resume().
[ 2506.936134] btusb 1-1.5:1.0: no reset_resume for driver btusb?
[ 2506.936137] btusb 1-1.5:1.1: no reset_resume for driver btusb?
Signed-off-by Shuah Khan <[email protected]>
---
 drivers/bluetooth/btusb.c |    1 +
 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +0 -0
index 7a7e5f8..1eb90c0 100644

drivers/bluetooth/btusb.c static struct usb_driver btusb_driver = { · line 1622

Quoted 7 lines

drivers/bluetooth/btusb.c +1 -0

@@ -1616,6 +1616,7 @@ static struct usb_driver btusb_driver = {
 #ifdef CONFIG_PM
 	.suspend	= btusb_suspend,
 	.resume		= btusb_resume,
+	.reset_resume	= btusb_resume,
 #endif
 	.id_table	= btusb_table,
 	.supports_autosuspend = 1,

Patch still doesn't apply, are you sending it with git-send-email?

Applying: Bluetooth: Add missing reset_resume dev_pm_ops /home/padovan/p/linux-trees/bluetooth-next/.git/rebase-apply/patch:13: trailing whitespace.
.reset_resume = btusb_resume,
error: patch failed: drivers/bluetooth/btusb.c:1616
error: drivers/bluetooth/btusb.c: patch does not apply
Patch failed at 0001 Bluetooth: Add missing reset_resume dev_pm_ops

Gustavo

Shuah Khan

author

2013-05-21 15:32 UTC #5 lore raw

T24gVHVlLCAyMDEzLTA1LTIxIGF0IDAwOjI4IC0wMzAwLCBHdXN0YXZvIFBhZG92YW4gd3JvdGU6 DQo+IEhpIFNodWFuLA0KPiANCj4gKiBTaHVhaCBLaGFuIDxzaHVhaC5raEBzYW1zdW5nLmNvbT4g WzIwMTMtMDUtMjEgMDE6MDI6NTggKzAwMDBdOg0KPiANCj4gPiBBZGQgbWlzc2luZyByZXNldF9y ZXN1bWUgZGV2X3BtX29wcy4gTWlzc2luZyByZXNldF9yZXN1bWUgcmVzdWx0cyBpbiB0aGUNCj4g PiBmb2xsb3dpbmcgbWVzc2FnZSBhZnRlciBwb3dlciBtYW5hZ2VtZW50IGRldmljZSB0ZXN0LiBU aGlzIGNoYW5nZSBzZXRzDQo+ID4gcmVzZXRfcmVzdW1lIHRvIGJ0dXNiX3Jlc3VtZSgpLg0KPiA+ IA0KPiA+IFsgMjUwNi45MzYxMzRdIGJ0dXNiIDEtMS41OjEuMDogbm8gcmVzZXRfcmVzdW1lIGZv ciBkcml2ZXIgYnR1c2I/DQo+ID4gWyAyNTA2LjkzNjEzN10gYnR1c2IgMS0xLjU6MS4xOiBubyBy ZXNldF9yZXN1bWUgZm9yIGRyaXZlciBidHVzYj8NCj4gPiANCj4gPiBTaWduZWQtb2ZmLWJ5OiBT aHVhaCBLaGFuIDxzaHVhaC5raEBzYW1zdW5nLmNvbT4NCj4gPiAtLS0NCj4gPiAgZHJpdmVycy9i bHVldG9vdGgvYnR1c2IuYyB8ICAgIDEgKw0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp b24oKykNCj4gPiANCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYyBi L2RyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMNCj4gPiBpbmRleCA3YTdlNWY4Li4xZWI5MGMwIDEw MDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMNCj4gPiArKysgYi9kcml2 ZXJzL2JsdWV0b290aC9idHVzYi5jDQo+ID4gQEAgLTE2MTYsNiArMTYxNiw3IEBAIHN0YXRpYyBz dHJ1Y3QgdXNiX2RyaXZlciBidHVzYl9kcml2ZXIgPSB7DQo+ID4gICNpZmRlZiBDT05GSUdfUE0N Cj4gPiAgCS5zdXNwZW5kCT0gYnR1c2Jfc3VzcGVuZCwNCj4gPiAgCS5yZXN1bWUJCT0gYnR1c2Jf cmVzdW1lLA0KPiA+ICsJLnJlc2V0X3Jlc3VtZQk9IGJ0dXNiX3Jlc3VtZSwNCj4gPiAgI2VuZGlm DQo+ID4gIAkuaWRfdGFibGUJPSBidHVzYl90YWJsZSwNCj4gPiAgCS5zdXBwb3J0c19hdXRvc3Vz cGVuZCA9IDEsDQo+IA0KPiBQYXRjaCBzdGlsbCBkb2Vzbid0IGFwcGx5LCBhcmUgeW91IHNlbmRp bmcgaXQgd2l0aCBnaXQtc2VuZC1lbWFpbD8NCj4gDQo+IEFwcGx5aW5nOiBCbHVldG9vdGg6IEFk ZCBtaXNzaW5nIHJlc2V0X3Jlc3VtZSBkZXZfcG1fb3BzDQo+IC9ob21lL3BhZG92YW4vcC9saW51 eC10cmVlcy9ibHVldG9vdGgtbmV4dC8uZ2l0L3JlYmFzZS1hcHBseS9wYXRjaDoxMzogdHJhaWxp bmcgd2hpdGVzcGFjZS4NCj4gICAgICAgICAucmVzZXRfcmVzdW1lICAgPSBidHVzYl9yZXN1bWUs DQo+IGVycm9yOiBwYXRjaCBmYWlsZWQ6IGRyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmM6MTYxNg0K PiBlcnJvcjogZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYzogcGF0Y2ggZG9lcyBub3QgYXBwbHkN Cj4gUGF0Y2ggZmFpbGVkIGF0IDAwMDEgQmx1ZXRvb3RoOiBBZGQgbWlzc2luZyByZXNldF9yZXN1 bWUgZGV2X3BtX29wcw0KPiANCj4gCUd1c3Rhdm8NCg0KSSBzYXZlZCB0aGUgcGF0Y2ggZnJvbSB0 aGUgZW1haWwgSSBzZW50IGFuZCBhcHBsaWVkIHRvIHlvdXIgbGF0ZXN0IGdpdA0KYW5kIGl0IGFw cGxpZXMuIEkgYW0gbm90IHN1cmUgd2hhdCBoYXBwZW5lZC4gSW4gYW55IGNhc2UsIEkganVzdCBy ZXNlbnQNCml0IHVzaW5nIGdpdC1zZW5kLWVtYWlsLiBIb3BlIHRoYXQgd29ya3MuDQoNCi0tIFNo dWFoDQoNClNodWFoIEtoYW4sIExpbnV4IEtlcm5lbCBEZXZlbG9wZXIgLSBPcGVuIFNvdXJjZSBH cm91cCANClNhbXN1bmcgUmVzZWFyY2ggQW1lcmljYSAoU2lsaWNvbiBWYWxsZXkpDQpzaHVhaC5r aEBzYW1zdW5nLmNvbSB8ICg5NzApIDY3Mi0wNjU4DQoNCg==