diff --git a/[refs] b/[refs]
index 20f0e563d572..cf3198426b20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 197c58f624bfb98d3f7f381e57b5d09b2360266f
+refs/heads/master: 75bfe23a36fc47dd95c5216b48caaf1fa9c55a65
diff --git a/trunk/drivers/usb/gadget/configfs.c b/trunk/drivers/usb/gadget/configfs.c
index a34633a898a1..3d5cfc9c2c78 100644
--- a/trunk/drivers/usb/gadget/configfs.c
+++ b/trunk/drivers/usb/gadget/configfs.c
@@ -439,7 +439,7 @@ static int config_usb_cfg_unlink(
 		}
 	}
 	mutex_unlock(&gi->lock);
-	__WARN_printf("Unable to locate function to unbind\n");
+	WARN(1, "Unable to locate function to unbind\n");
 	return 0;
 }
 
@@ -730,7 +730,7 @@ USB_CONFIG_STRINGS_LANG(gadget_strings, gadget_info);
 
 static int configfs_do_nothing(struct usb_composite_dev *cdev)
 {
-	__WARN();
+	WARN_ON(1);
 	return -EINVAL;
 }