rts5139: switch to ->show_info() (38c19ec9) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/staging/rts5139/rts51x_scsi.c

+9 −21

Original line number	Diff line number	Diff line
		@@ -1968,18 +1968,16 @@ int slave_configure(struct scsi_device *sdev)

		/* we use this macro to help us write into the buffer */
		#undef SPRINTF
		#define SPRINTF(args...) \
		do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
		#define SPRINTF(args...) seq_printf(m, ##args)

		int proc_info(struct Scsi_Host host, char buffer,
		char **start, off_t offset, int length, int inout)
		static int write_info(struct Scsi_Host host, char buffer, int length)
		{
		char *pos = buffer;

		/* if someone is sending us data, just throw it away */
		if (inout)
		return length;
		}

		static int show_info(struct seq_file m, struct Scsi_Host host)
		{
		/* print the controller name */
		SPRINTF(" Host scsi%d: %s\n", host->host_no, RTS51X_NAME);

		@@ -1988,18 +1986,7 @@ int proc_info(struct Scsi_Host host, char buffer,
		SPRINTF(" Product: RTS51xx USB Card Reader\n");
		SPRINTF(" Version: %s\n", DRIVER_VERSION);
		SPRINTF(" Build: %s\n", __TIME__);

		/*
		* Calculate start of next buffer, and return value.
		*/
		*start = buffer + offset;

		if ((pos - buffer) < offset)
		return 0;
		else if ((pos - buffer - offset) < length)
		return pos - buffer - offset;
		else
		return length;
		}

		/* queue a command */
		@@ -2100,7 +2087,8 @@ struct scsi_host_template rts51x_host_template = {
		/* basic userland interface stuff */
		.name = RTS51X_NAME,
		.proc_name = RTS51X_NAME,
		.proc_info = proc_info,
		.show_info = show_info,
		.write_info = write_info,
		.info = rts5139_info,

		/* command interface -- queued only */

+0 −2

Original line number	Diff line number	Diff line
		@@ -147,8 +147,6 @@ struct scsi_cmnd;

		int slave_alloc(struct scsi_device *sdev);
		int slave_configure(struct scsi_device *sdev);
		int proc_info(struct Scsi_Host host, char buffer,
		char **start, off_t offset, int length, int inout);
		int queuecommand(struct Scsi_Host , struct scsi_cmnd );
		int command_abort(struct scsi_cmnd *srb);
		int device_reset(struct scsi_cmnd *srb);