Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
38c19ec9
Commit
38c19ec9
authored
Mar 31, 2013
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rts5139: switch to ->show_info()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
8946b077
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
23 deletions
+9
-23
drivers/staging/rts5139/rts51x_scsi.c
drivers/staging/rts5139/rts51x_scsi.c
+9
-21
drivers/staging/rts5139/rts51x_scsi.h
drivers/staging/rts5139/rts51x_scsi.h
+0
-2
No files found.
drivers/staging/rts5139/rts51x_scsi.c
View file @
38c19ec9
...
...
@@ -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
;
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
;
return
0
;
}
/* 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 */
...
...
drivers/staging/rts5139/rts51x_scsi.h
View file @
38c19ec9
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment