usb: storage: Convert usb_stor_dbg to return void (e5283626) · Commits · 戴 / test

drivers/usb/storage/debug.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -179,17 +179,14 @@ void usb_stor_show_sense(const struct us_data *us,
		US_DEBUGPX("\n");
		}

		int usb_stor_dbg(const struct us_data us, const char fmt, ...)
		void usb_stor_dbg(const struct us_data us, const char fmt, ...)
		{
		va_list args;
		int r;

		va_start(args, fmt);

		r = dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args);
		dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args);

		va_end(args);

		return r;
		}
		EXPORT_SYMBOL_GPL(usb_stor_dbg);

+6 −4

Original line number	Diff line number	Diff line
		@@ -50,15 +50,17 @@
		void usb_stor_show_command(const struct us_data us, struct scsi_cmnd srb);
		void usb_stor_show_sense(const struct us_data *us, unsigned char key,
		unsigned char asc, unsigned char ascq);
		__printf(2, 3) int usb_stor_dbg(const struct us_data *us,
		__printf(2, 3) void usb_stor_dbg(const struct us_data *us,
		const char *fmt, ...);

		#define US_DEBUGPX(fmt, ...) printk(fmt, ##__VA_ARGS__)
		#define US_DEBUG(x) x
		#else
		__printf(2, 3)
		static inline int _usb_stor_dbg(const struct us_data *us,
		const char *fmt, ...) {return 1;}
		static inline void _usb_stor_dbg(const struct us_data *us,
		const char *fmt, ...)
		{
		}
		#define usb_stor_dbg(us, fmt, ...) \
		do { if (0) _usb_stor_dbg(us, fmt, ##__VA_ARGS__); } while (0)
		#define US_DEBUGPX(fmt, ...) \