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
97d6104b
Commit
97d6104b
authored
May 16, 2012
by
Artem Bityutskiy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UBI: rename few functions for consistency
Signed-off-by:
Artem Bityutskiy
<
artem.bityutskiy@linux.intel.com
>
parent
e2986827
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
14 deletions
+15
-14
drivers/mtd/ubi/debug.h
drivers/mtd/ubi/debug.h
+2
-3
drivers/mtd/ubi/io.c
drivers/mtd/ubi/io.c
+11
-9
drivers/mtd/ubi/wl.c
drivers/mtd/ubi/wl.c
+2
-2
No files found.
drivers/mtd/ubi/debug.h
View file @
97d6104b
...
@@ -62,9 +62,8 @@ void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx);
...
@@ -62,9 +62,8 @@ void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx);
void
ubi_dump_sv
(
const
struct
ubi_scan_volume
*
sv
);
void
ubi_dump_sv
(
const
struct
ubi_scan_volume
*
sv
);
void
ubi_dump_seb
(
const
struct
ubi_scan_leb
*
seb
,
int
type
);
void
ubi_dump_seb
(
const
struct
ubi_scan_leb
*
seb
,
int
type
);
void
ubi_dump_mkvol_req
(
const
struct
ubi_mkvol_req
*
req
);
void
ubi_dump_mkvol_req
(
const
struct
ubi_mkvol_req
*
req
);
int
ubi_dbg_check_all_ff
(
struct
ubi_device
*
ubi
,
int
pnum
,
int
offset
,
int
len
);
int
ubi_self_check_all_ff
(
struct
ubi_device
*
ubi
,
int
pnum
,
int
offset
,
int
ubi_dbg_check_write
(
struct
ubi_device
*
ubi
,
const
void
*
buf
,
int
pnum
,
int
len
);
int
offset
,
int
len
);
int
ubi_debugging_init_dev
(
struct
ubi_device
*
ubi
);
int
ubi_debugging_init_dev
(
struct
ubi_device
*
ubi
);
void
ubi_debugging_exit_dev
(
struct
ubi_device
*
ubi
);
void
ubi_debugging_exit_dev
(
struct
ubi_device
*
ubi
);
int
ubi_debugfs_init
(
void
);
int
ubi_debugfs_init
(
void
);
...
...
drivers/mtd/ubi/io.c
View file @
97d6104b
...
@@ -98,6 +98,8 @@ static int self_check_ec_hdr(const struct ubi_device *ubi, int pnum,
...
@@ -98,6 +98,8 @@ static int self_check_ec_hdr(const struct ubi_device *ubi, int pnum,
static
int
self_check_peb_vid_hdr
(
const
struct
ubi_device
*
ubi
,
int
pnum
);
static
int
self_check_peb_vid_hdr
(
const
struct
ubi_device
*
ubi
,
int
pnum
);
static
int
self_check_vid_hdr
(
const
struct
ubi_device
*
ubi
,
int
pnum
,
static
int
self_check_vid_hdr
(
const
struct
ubi_device
*
ubi
,
int
pnum
,
const
struct
ubi_vid_hdr
*
vid_hdr
);
const
struct
ubi_vid_hdr
*
vid_hdr
);
static
int
self_check_write
(
struct
ubi_device
*
ubi
,
const
void
*
buf
,
int
pnum
,
int
offset
,
int
len
);
/**
/**
* ubi_io_read - read data from a physical eraseblock.
* ubi_io_read - read data from a physical eraseblock.
...
@@ -254,7 +256,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
...
@@ -254,7 +256,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
return
err
;
return
err
;
/* The area we are writing to has to contain all 0xFF bytes */
/* The area we are writing to has to contain all 0xFF bytes */
err
=
ubi_
dbg
_check_all_ff
(
ubi
,
pnum
,
offset
,
len
);
err
=
ubi_
self
_check_all_ff
(
ubi
,
pnum
,
offset
,
len
);
if
(
err
)
if
(
err
)
return
err
;
return
err
;
...
@@ -289,7 +291,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
...
@@ -289,7 +291,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
ubi_assert
(
written
==
len
);
ubi_assert
(
written
==
len
);
if
(
!
err
)
{
if
(
!
err
)
{
err
=
ubi_dbg
_check_write
(
ubi
,
buf
,
pnum
,
offset
,
len
);
err
=
self
_check_write
(
ubi
,
buf
,
pnum
,
offset
,
len
);
if
(
err
)
if
(
err
)
return
err
;
return
err
;
...
@@ -300,7 +302,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
...
@@ -300,7 +302,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
offset
+=
len
;
offset
+=
len
;
len
=
ubi
->
peb_size
-
offset
;
len
=
ubi
->
peb_size
-
offset
;
if
(
len
)
if
(
len
)
err
=
ubi_
dbg
_check_all_ff
(
ubi
,
pnum
,
offset
,
len
);
err
=
ubi_
self
_check_all_ff
(
ubi
,
pnum
,
offset
,
len
);
}
}
return
err
;
return
err
;
...
@@ -382,7 +384,7 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum)
...
@@ -382,7 +384,7 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum)
return
-
EIO
;
return
-
EIO
;
}
}
err
=
ubi_
dbg
_check_all_ff
(
ubi
,
pnum
,
0
,
ubi
->
peb_size
);
err
=
ubi_
self
_check_all_ff
(
ubi
,
pnum
,
0
,
ubi
->
peb_size
);
if
(
err
)
if
(
err
)
return
err
;
return
err
;
...
@@ -1316,7 +1318,7 @@ static int self_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum)
...
@@ -1316,7 +1318,7 @@ static int self_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum)
}
}
/**
/**
*
ubi_dbg
_check_write - make sure write succeeded.
*
self
_check_write - make sure write succeeded.
* @ubi: UBI device description object
* @ubi: UBI device description object
* @buf: buffer with data which were written
* @buf: buffer with data which were written
* @pnum: physical eraseblock number the data were written to
* @pnum: physical eraseblock number the data were written to
...
@@ -1327,7 +1329,7 @@ static int self_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum)
...
@@ -1327,7 +1329,7 @@ static int self_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum)
* the original data buffer - the data have to match. Returns zero if the data
* the original data buffer - the data have to match. Returns zero if the data
* match and a negative error code if not or in case of failure.
* match and a negative error code if not or in case of failure.
*/
*/
int
ubi_dbg
_check_write
(
struct
ubi_device
*
ubi
,
const
void
*
buf
,
int
pnum
,
static
int
self
_check_write
(
struct
ubi_device
*
ubi
,
const
void
*
buf
,
int
pnum
,
int
offset
,
int
len
)
int
offset
,
int
len
)
{
{
int
err
,
i
;
int
err
,
i
;
...
@@ -1382,7 +1384,7 @@ int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,
...
@@ -1382,7 +1384,7 @@ int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,
}
}
/**
/**
* ubi_
dbg
_check_all_ff - check that a region of flash is empty.
* ubi_
self
_check_all_ff - check that a region of flash is empty.
* @ubi: UBI device description object
* @ubi: UBI device description object
* @pnum: the physical eraseblock number to check
* @pnum: the physical eraseblock number to check
* @offset: the starting offset within the physical eraseblock to check
* @offset: the starting offset within the physical eraseblock to check
...
@@ -1392,7 +1394,7 @@ int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,
...
@@ -1392,7 +1394,7 @@ int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,
* @offset of the physical eraseblock @pnum, and a negative error code if not
* @offset of the physical eraseblock @pnum, and a negative error code if not
* or if an error occurred.
* or if an error occurred.
*/
*/
int
ubi_
dbg
_check_all_ff
(
struct
ubi_device
*
ubi
,
int
pnum
,
int
offset
,
int
len
)
int
ubi_
self
_check_all_ff
(
struct
ubi_device
*
ubi
,
int
pnum
,
int
offset
,
int
len
)
{
{
size_t
read
;
size_t
read
;
int
err
;
int
err
;
...
...
drivers/mtd/ubi/wl.c
View file @
97d6104b
...
@@ -414,7 +414,7 @@ int ubi_wl_get_peb(struct ubi_device *ubi)
...
@@ -414,7 +414,7 @@ int ubi_wl_get_peb(struct ubi_device *ubi)
prot_queue_add
(
ubi
,
e
);
prot_queue_add
(
ubi
,
e
);
spin_unlock
(
&
ubi
->
wl_lock
);
spin_unlock
(
&
ubi
->
wl_lock
);
err
=
ubi_
dbg
_check_all_ff
(
ubi
,
e
->
pnum
,
ubi
->
vid_hdr_aloffset
,
err
=
ubi_
self
_check_all_ff
(
ubi
,
e
->
pnum
,
ubi
->
vid_hdr_aloffset
,
ubi
->
peb_size
-
ubi
->
vid_hdr_aloffset
);
ubi
->
peb_size
-
ubi
->
vid_hdr_aloffset
);
if
(
err
)
{
if
(
err
)
{
ubi_err
(
"new PEB %d does not contain all 0xFF bytes"
,
e
->
pnum
);
ubi_err
(
"new PEB %d does not contain all 0xFF bytes"
,
e
->
pnum
);
...
...
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