AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-30 01:16:41 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michal Nazarewicz 2010-10-28 17:31:20 +02:00 committed by Greg Kroah-Hartman
parent 17a936117c
commit 1ccd7923fe
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/gadget/f_mass_storage.c
View File

@ -2822,14 +2822,12 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
i = 0x0399; i = 0x0399;
} }
} }
#define OR(x, y) ((x) ? (x) : (y))
snprintf(common->inquiry_string, sizeof common->inquiry_string, snprintf(common->inquiry_string, sizeof common->inquiry_string,
"%-8s%-16s%04x", "%-8s%-16s%04x", cfg->vendor_name ?: "Linux",
OR(cfg->vendor_name, "Linux "),
/* Assume product name dependent on the first LUN */ /* 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-Stor Gadget"
: "File-CD Gadget "), : "File-CD Gadget"),
i); i);
@ -2848,14 +2846,13 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
/* Tell the thread to start working */ /* Tell the thread to start working */
common->thread_task = common->thread_task =
kthread_create(fsg_main_thread, common, kthread_create(fsg_main_thread, common,
OR(cfg->thread_name, "file-storage")); cfg->thread_name ?: "file-storage");
if (IS_ERR(common->thread_task)) { if (IS_ERR(common->thread_task)) {
rc = PTR_ERR(common->thread_task); rc = PTR_ERR(common->thread_task);
goto error_release; goto error_release;
} }
init_completion(&common->thread_notifier); init_completion(&common->thread_notifier);
init_waitqueue_head(&common->fsg_wait); init_waitqueue_head(&common->fsg_wait);
#undef OR
/* Information */ /* Information */