Embedded_Projects/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: blk: Rename get_desc() and make it externally visible

Browse Source 
get_desc() can be useful outside blk-uclass.c. Let's change it to
an API and make it externally visible.

Signed-off-by: Bin Meng <bmeng@tinylab.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2023-09-26 16:43:41 +08:00 committed by Tom Rini
parent 8ccc948f40
commit a9bf25cb93
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/block/blk-uclass.c
View File

@ -178,17 +178,7 @@ struct blk_desc *blk_get_by_device(struct udevice *dev)
return NULL; return NULL;
} }
/** int blk_get_desc(enum uclass_id uclass_id, int devnum, struct blk_desc **descp)
* get_desc() - Get the block device descriptor for the given device number
*
* @uclass_id: Interface type
* @devnum: Device number (0 = first)
* @descp: Returns block device descriptor on success
* Return: 0 on success, -ENODEV if there is no such device and no device
* with a higher device number, -ENOENT if there is no such device but there
* is one with a higher number, or other -ve on other error.
*/
static int get_desc(enum uclass_id uclass_id, int devnum, struct blk_desc **descp)
{ {
bool found_more = false; bool found_more = false;
struct udevice *dev; struct udevice *dev;
@ -240,7 +230,7 @@ int blk_list_part(enum uclass_id uclass_id)
int ret; int ret;
for (ok = 0, devnum = 0;; ++devnum) { for (ok = 0, devnum = 0;; ++devnum) {
ret = get_desc(uclass_id, devnum, &desc); ret = blk_get_desc(uclass_id, devnum, &desc);
if (ret == -ENODEV) if (ret == -ENODEV)
break; break;
else if (ret) else if (ret)
@ -263,7 +253,7 @@ int blk_print_part_devnum(enum uclass_id uclass_id, int devnum)
struct blk_desc *desc; struct blk_desc *desc;
int ret; int ret;
ret = get_desc(uclass_id, devnum, &desc); ret = blk_get_desc(uclass_id, devnum, &desc);
if (ret) if (ret)
return ret; return ret;
if (desc->type == DEV_TYPE_UNKNOWN) if (desc->type == DEV_TYPE_UNKNOWN)
@ -280,7 +270,7 @@ void blk_list_devices(enum uclass_id uclass_id)
int i; int i;
for (i = 0;; ++i) { for (i = 0;; ++i) {
ret = get_desc(uclass_id, i, &desc); ret = blk_get_desc(uclass_id, i, &desc);
if (ret == -ENODEV) if (ret == -ENODEV)
break; break;
else if (ret) else if (ret)
@ -297,7 +287,7 @@ int blk_print_device_num(enum uclass_id uclass_id, int devnum)
struct blk_desc *desc; struct blk_desc *desc;
int ret; int ret;
ret = get_desc(uclass_id, devnum, &desc); ret = blk_get_desc(uclass_id, devnum, &desc);
if (ret) if (ret)
return ret; return ret;
printf("\nIDE device %d: ", devnum); printf("\nIDE device %d: ", devnum);
@ -312,7 +302,7 @@ int blk_show_device(enum uclass_id uclass_id, int devnum)
int ret; int ret;
printf("\nDevice %d: ", devnum); printf("\nDevice %d: ", devnum);
ret = get_desc(uclass_id, devnum, &desc); ret = blk_get_desc(uclass_id, devnum, &desc);
if (ret == -ENODEV || ret == -ENOENT) { if (ret == -ENODEV || ret == -ENOENT) {
printf("unknown device\n"); printf("unknown device\n");
return -ENODEV; return -ENODEV;
@ -334,7 +324,7 @@ ulong blk_read_devnum(enum uclass_id uclass_id, int devnum, lbaint_t start,
ulong n; ulong n;
int ret; int ret;
ret = get_desc(uclass_id, devnum, &desc); ret = blk_get_desc(uclass_id, devnum, &desc);
if (ret) if (ret)
return ret; return ret;
n = blk_dread(desc, start, blkcnt, buffer); n = blk_dread(desc, start, blkcnt, buffer);
@ -350,7 +340,7 @@ ulong blk_write_devnum(enum uclass_id uclass_id, int devnum, lbaint_t start,
struct blk_desc *desc; struct blk_desc *desc;
int ret; int ret;
ret = get_desc(uclass_id, devnum, &desc); ret = blk_get_desc(uclass_id, devnum, &desc);
if (ret) if (ret)
return ret; return ret;
return blk_dwrite(desc, start, blkcnt, buffer); return blk_dwrite(desc, start, blkcnt, buffer);

12
include/blk.h
View File

@ -515,6 +515,18 @@ const char *blk_get_devtype(struct udevice *dev);
*/ */
struct blk_desc *blk_get_by_device(struct udevice *dev); struct blk_desc *blk_get_by_device(struct udevice *dev);
/**
* blk_get_desc() - Get the block device descriptor for the given device number
*
* @uclass_id: Interface type
* @devnum: Device number (0 = first)
* @descp: Returns block device descriptor on success
* Return: 0 on success, -ENODEV if there is no such device and no device
* with a higher device number, -ENOENT if there is no such device but there
* is one with a higher number, or other -ve on other error.
*/
int blk_get_desc(enum uclass_id uclass_id, int devnum, struct blk_desc **descp);
#else #else
#include <errno.h> #include <errno.h>
/* /*