projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2019-07-17-master-imports'
[oweals/u-boot.git]
/
drivers
/
block
/
blk_legacy.c
diff --git
a/drivers/block/blk_legacy.c
b/drivers/block/blk_legacy.c
index 7b90a8a6e18ebc3010bf043b5d71c4966f2fba75..0c343f7b6460add4cfd9c3cb2bd1fbb2195640a3 100644
(file)
--- a/
drivers/block/blk_legacy.c
+++ b/
drivers/block/blk_legacy.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2016 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
/*
* Copyright (C) 2016 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-38,6
+37,13
@@
static struct blk_driver *blk_driver_lookup_typename(const char *if_typename)
return NULL;
}
return NULL;
}
+const char *blk_get_if_type_name(enum if_type if_type)
+{
+ struct blk_driver *drv = blk_driver_lookup_type(if_type);
+
+ return drv ? drv->if_typename : NULL;
+}
+
/**
* get_desc() - Get the block device descriptor for the given device number
*
/**
* get_desc() - Get the block device descriptor for the given device number
*
@@
-62,7
+68,7
@@
static int get_desc(struct blk_driver *drv, int devnum, struct blk_desc **descp)
return drv->get_dev(devnum, descp);
}
return drv->get_dev(devnum, descp);
}
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef
CONFIG_
HAVE_BLOCK_DEVICE
int blk_list_part(enum if_type if_type)
{
struct blk_driver *drv;
int blk_list_part(enum if_type if_type)
{
struct blk_driver *drv;
@@
-166,7
+172,7
@@
int blk_show_device(enum if_type if_type, int devnum)
return 0;
}
return 0;
}
-#endif /* HAVE_BLOCK_DEVICE */
+#endif /*
CONFIG_
HAVE_BLOCK_DEVICE */
struct blk_desc *blk_get_devnum_by_type(enum if_type if_type, int devnum)
{
struct blk_desc *blk_get_devnum_by_type(enum if_type if_type, int devnum)
{
@@
-225,9
+231,6
@@
ulong blk_read_devnum(enum if_type if_type, int devnum, lbaint_t start,
if (IS_ERR_VALUE(n))
return n;
if (IS_ERR_VALUE(n))
return n;
- /* flush cache after read */
- flush_cache((ulong)buffer, blkcnt * desc->blksz);
-
return n;
}
return n;
}