On Wed, Jun 7, 2017 at 9:59 AM, Dmitry Torokhov
[off-list ref] wrote:

Instead of calling into usbhid code directly, let's use the standard
accessors for the transport HID drivers, and stop clobbering their error
codes with -EIO.

This also allows us to remove usbhid_get/put_power(), leaving only
usbhid_power().

                break;
+
        case PM_HINT_NORMAL:

        }
+
        return r;

I think you can drop above changes.

-- 
With Best Regards,
Andy Shevchenko