Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ccd7923 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 17a93611

drivers/usb/gadget/f_mass_storage.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -2822,12 +2822,10 @@ buffhds_first_it: 
			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 @@ buffhds_first_it: 
	/* 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 */