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
nexedi
linux
Commits
09dae7fc
Commit
09dae7fc
authored
Mar 31, 2013
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
usb-storage: switch to ->show_info()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
dd7ab71b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
28 deletions
+14
-28
drivers/usb/storage/scsiglue.c
drivers/usb/storage/scsiglue.c
+14
-28
No files found.
drivers/usb/storage/scsiglue.c
View file @
09dae7fc
...
@@ -438,22 +438,21 @@ void usb_stor_report_bus_reset(struct us_data *us)
...
@@ -438,22 +438,21 @@ void usb_stor_report_bus_reset(struct us_data *us)
* /proc/scsi/ functions
* /proc/scsi/ functions
***********************************************************************/
***********************************************************************/
static
int
write_info
(
struct
Scsi_Host
*
host
,
char
*
buffer
,
int
length
)
{
/* if someone is sending us data, just throw it away */
return
length
;
}
/* we use this macro to help us write into the buffer */
/* we use this macro to help us write into the buffer */
#undef SPRINTF
#undef SPRINTF
#define SPRINTF(args...) \
#define SPRINTF(args...) seq_printf(m, ## args)
do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
static
int
proc_info
(
struct
Scsi_Host
*
host
,
char
*
buffer
,
static
int
show_info
(
struct
seq_file
*
m
,
struct
Scsi_Host
*
host
)
char
**
start
,
off_t
offset
,
int
length
,
int
inout
)
{
{
struct
us_data
*
us
=
host_to_us
(
host
);
struct
us_data
*
us
=
host_to_us
(
host
);
char
*
pos
=
buffer
;
const
char
*
string
;
const
char
*
string
;
/* if someone is sending us data, just throw it away */
if
(
inout
)
return
length
;
/* print the controller name */
/* print the controller name */
SPRINTF
(
" Host scsi%d: usb-storage
\n
"
,
host
->
host_no
);
SPRINTF
(
" Host scsi%d: usb-storage
\n
"
,
host
->
host_no
);
...
@@ -483,28 +482,14 @@ static int proc_info (struct Scsi_Host *host, char *buffer,
...
@@ -483,28 +482,14 @@ static int proc_info (struct Scsi_Host *host, char *buffer,
SPRINTF
(
" Transport: %s
\n
"
,
us
->
transport_name
);
SPRINTF
(
" Transport: %s
\n
"
,
us
->
transport_name
);
/* show the device flags */
/* show the device flags */
if
(
pos
<
buffer
+
length
)
{
SPRINTF
(
" Quirks:"
);
pos
+=
sprintf
(
pos
,
" Quirks:"
);
#define US_FLAG(name, value) \
#define US_FLAG(name, value) \
if (us->fflags & value)
pos += sprintf(pos
, " " #name);
if (us->fflags & value)
seq_printf(m
, " " #name);
US_DO_ALL_FLAGS
US_DO_ALL_FLAGS
#undef US_FLAG
#undef US_FLAG
seq_putc
(
m
,
'\n'
);
*
(
pos
++
)
=
'\n'
;
return
0
;
}
/*
* 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
);
}
}
/***********************************************************************
/***********************************************************************
...
@@ -549,7 +534,8 @@ struct scsi_host_template usb_stor_host_template = {
...
@@ -549,7 +534,8 @@ struct scsi_host_template usb_stor_host_template = {
/* basic userland interface stuff */
/* basic userland interface stuff */
.
name
=
"usb-storage"
,
.
name
=
"usb-storage"
,
.
proc_name
=
"usb-storage"
,
.
proc_name
=
"usb-storage"
,
.
proc_info
=
proc_info
,
.
show_info
=
show_info
,
.
write_info
=
write_info
,
.
info
=
host_info
,
.
info
=
host_info
,
/* command interface -- queued only */
/* command interface -- queued only */
...
...
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