Merge tags 'modules-next-for-linus' and 'virtio-next-for-linus' of git://git.kernel...

[karo-tx-linux.git] / drivers / usb / storage / option_ms.c

diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c
index e0f76bb05915cb63647a5470c71714c61e0a52ce..b2b35b1d7de824b5724b107410098b2b7ef6b5c8 100644 (file)
--- a/drivers/usb/storage/option_ms.c
+++ b/drivers/usb/storage/option_ms.c
@@ -50,7 +50,7 @@ static int option_rezero(struct us_data *us)
        char *buffer;
        int result;
 
-       US_DEBUGP("Option MS: %s", "DEVICE MODE SWITCH\n");
+       usb_stor_dbg(us, "Option MS: %s\n", "DEVICE MODE SWITCH");
 
        buffer = kzalloc(RESPONSE_LEN, GFP_KERNEL);
        if (buffer == NULL)
@@ -95,7 +95,7 @@ static int option_inquiry(struct us_data *us)
        char *buffer;
        int result;
 
-       US_DEBUGP("Option MS: %s", "device inquiry for vendor name\n");
+       usb_stor_dbg(us, "Option MS: %s\n", "device inquiry for vendor name");
 
        buffer = kzalloc(0x24, GFP_KERNEL);
        if (buffer == NULL)
@@ -138,31 +138,32 @@ int option_ms_init(struct us_data *us)
 {
        int result;
 
-       US_DEBUGP("Option MS: option_ms_init called\n");
+       usb_stor_dbg(us, "Option MS: %s\n", "option_ms_init called");
 
        /* Additional test for vendor information via INQUIRY,
         * because some vendor/product IDs are ambiguous
         */
        result = option_inquiry(us);
        if (result != 0) {
-               US_DEBUGP("Option MS: vendor is not Option or not determinable,"
-                         " no action taken\n");
+               usb_stor_dbg(us, "Option MS: %s\n",
+                            "vendor is not Option or not determinable, no action taken");
                return 0;
        } else
-               US_DEBUGP("Option MS: this is a genuine Option device,"
-                         " proceeding\n");
+               usb_stor_dbg(us, "Option MS: %s\n",
+                            "this is a genuine Option device, proceeding");
 
        /* Force Modem mode */
        if (option_zero_cd == ZCD_FORCE_MODEM) {
-               US_DEBUGP("Option MS: %s", "Forcing Modem Mode\n");
+               usb_stor_dbg(us, "Option MS: %s\n", "Forcing Modem Mode");
                result = option_rezero(us);
                if (result != USB_STOR_XFER_GOOD)
-                       US_DEBUGP("Option MS: Failed to switch to modem mode.\n");
+                       usb_stor_dbg(us, "Option MS: %s\n",
+                                    "Failed to switch to modem mode");
                return -EIO;
        } else if (option_zero_cd == ZCD_ALLOW_MS) {
                /* Allow Mass Storage mode (keep CD-Rom) */
-               US_DEBUGP("Option MS: %s", "Allowing Mass Storage Mode if device"
-                         " requests it\n");
+               usb_stor_dbg(us, "Option MS: %s\n",
+                            "Allowing Mass Storage Mode if device requests it");
        }
 
        return 0;