Skip to content

Commit a9bf25c

Browse files
lbmengtrini
authored andcommitted
dm: blk: Rename get_desc() and make it externally visible
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 <[email protected]> Reviewed-by: Simon Glass <[email protected]>
1 parent 8ccc948 commit a9bf25c

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

drivers/block/blk-uclass.c

+8-18
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,7 @@ struct blk_desc *blk_get_by_device(struct udevice *dev)
178178
return NULL;
179179
}
180180

181-
/**
182-
* get_desc() - Get the block device descriptor for the given device number
183-
*
184-
* @uclass_id: Interface type
185-
* @devnum: Device number (0 = first)
186-
* @descp: Returns block device descriptor on success
187-
* Return: 0 on success, -ENODEV if there is no such device and no device
188-
* with a higher device number, -ENOENT if there is no such device but there
189-
* is one with a higher number, or other -ve on other error.
190-
*/
191-
static int get_desc(enum uclass_id uclass_id, int devnum, struct blk_desc **descp)
181+
int blk_get_desc(enum uclass_id uclass_id, int devnum, struct blk_desc **descp)
192182
{
193183
bool found_more = false;
194184
struct udevice *dev;
@@ -240,7 +230,7 @@ int blk_list_part(enum uclass_id uclass_id)
240230
int ret;
241231

242232
for (ok = 0, devnum = 0;; ++devnum) {
243-
ret = get_desc(uclass_id, devnum, &desc);
233+
ret = blk_get_desc(uclass_id, devnum, &desc);
244234
if (ret == -ENODEV)
245235
break;
246236
else if (ret)
@@ -263,7 +253,7 @@ int blk_print_part_devnum(enum uclass_id uclass_id, int devnum)
263253
struct blk_desc *desc;
264254
int ret;
265255

266-
ret = get_desc(uclass_id, devnum, &desc);
256+
ret = blk_get_desc(uclass_id, devnum, &desc);
267257
if (ret)
268258
return ret;
269259
if (desc->type == DEV_TYPE_UNKNOWN)
@@ -280,7 +270,7 @@ void blk_list_devices(enum uclass_id uclass_id)
280270
int i;
281271

282272
for (i = 0;; ++i) {
283-
ret = get_desc(uclass_id, i, &desc);
273+
ret = blk_get_desc(uclass_id, i, &desc);
284274
if (ret == -ENODEV)
285275
break;
286276
else if (ret)
@@ -297,7 +287,7 @@ int blk_print_device_num(enum uclass_id uclass_id, int devnum)
297287
struct blk_desc *desc;
298288
int ret;
299289

300-
ret = get_desc(uclass_id, devnum, &desc);
290+
ret = blk_get_desc(uclass_id, devnum, &desc);
301291
if (ret)
302292
return ret;
303293
printf("\nIDE device %d: ", devnum);
@@ -312,7 +302,7 @@ int blk_show_device(enum uclass_id uclass_id, int devnum)
312302
int ret;
313303

314304
printf("\nDevice %d: ", devnum);
315-
ret = get_desc(uclass_id, devnum, &desc);
305+
ret = blk_get_desc(uclass_id, devnum, &desc);
316306
if (ret == -ENODEV || ret == -ENOENT) {
317307
printf("unknown device\n");
318308
return -ENODEV;
@@ -334,7 +324,7 @@ ulong blk_read_devnum(enum uclass_id uclass_id, int devnum, lbaint_t start,
334324
ulong n;
335325
int ret;
336326

337-
ret = get_desc(uclass_id, devnum, &desc);
327+
ret = blk_get_desc(uclass_id, devnum, &desc);
338328
if (ret)
339329
return ret;
340330
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,
350340
struct blk_desc *desc;
351341
int ret;
352342

353-
ret = get_desc(uclass_id, devnum, &desc);
343+
ret = blk_get_desc(uclass_id, devnum, &desc);
354344
if (ret)
355345
return ret;
356346
return blk_dwrite(desc, start, blkcnt, buffer);

include/blk.h

+12
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,18 @@ const char *blk_get_devtype(struct udevice *dev);
515515
*/
516516
struct blk_desc *blk_get_by_device(struct udevice *dev);
517517

518+
/**
519+
* blk_get_desc() - Get the block device descriptor for the given device number
520+
*
521+
* @uclass_id: Interface type
522+
* @devnum: Device number (0 = first)
523+
* @descp: Returns block device descriptor on success
524+
* Return: 0 on success, -ENODEV if there is no such device and no device
525+
* with a higher device number, -ENOENT if there is no such device but there
526+
* is one with a higher number, or other -ve on other error.
527+
*/
528+
int blk_get_desc(enum uclass_id uclass_id, int devnum, struct blk_desc **descp);
529+
518530
#else
519531
#include <errno.h>
520532
/*

0 commit comments

Comments
 (0)