USB: gadget: f_mass_storage: use ?: instead of a macro

This commit removes an "OR" macro defined in Mass Storage
Function in favour of a two argument version of "?:" operator
(which is a GCC extension).

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index c89b99295c1fac2ca043465fa9aa93ec2f777f15..2a4aca1d48650701c2ed5bb0220c06991c1662e5 100644 (file)
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -2822,14 +2822,12 @@ buffhds_first_it:
                        i = 0x0399;
                }
        }
-#define OR(x, y) ((x) ? (x) : (y))
        snprintf(common->inquiry_string, sizeof common->inquiry_string,
-                "%-8s%-16s%04x",
-                OR(cfg->vendor_name, "Linux   "),
+                "%-8s%-16s%04x", cfg->vendor_name ?: "Linux",
                 /* Assume product name dependent on the first LUN */
-                OR(cfg->product_name, common->luns->cdrom
+                cfg->product_name ?: (common->luns->cdrom
                                     ? "File-Stor Gadget"
-                                    : "File-CD Gadget  "),
+                                    : "File-CD Gadget"),
                 i);
 
 
@@ -2848,14 +2846,13 @@ buffhds_first_it:
        /* Tell the thread to start working */
        common->thread_task =
                kthread_create(fsg_main_thread, common,
-                              OR(cfg->thread_name, "file-storage"));
+                              cfg->thread_name ?: "file-storage");
        if (IS_ERR(common->thread_task)) {
                rc = PTR_ERR(common->thread_task);
                goto error_release;
        }
        init_completion(&common->thread_notifier);
        init_waitqueue_head(&common->fsg_wait);
-#undef OR
 
 
        /* Information */