aboutsummaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/mmc.c4
-rw-r--r--drivers/mmc/mmc_private.h6
-rw-r--r--drivers/mmc/mmc_spi.c6
-rw-r--r--drivers/mmc/octeontx_hsmmc.c36
-rw-r--r--drivers/mmc/sdhci-adma.c2
5 files changed, 27 insertions, 27 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 4d9871d..f6ccd83 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -215,7 +215,7 @@ int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
* @data: additional data to send/receive
* @retries: how many times to retry; mmc_send_cmd is always called at least
* once
- * @return 0 if ok, -ve on error
+ * Return: 0 if ok, -ve on error
*/
static int mmc_send_cmd_retry(struct mmc *mmc, struct mmc_cmd *cmd,
struct mmc_data *data, uint retries)
@@ -239,7 +239,7 @@ static int mmc_send_cmd_retry(struct mmc *mmc, struct mmc_cmd *cmd,
* @quirk: retry only if this quirk is enabled
* @retries: how many times to retry; mmc_send_cmd is always called at least
* once
- * @return 0 if ok, -ve on error
+ * Return: 0 if ok, -ve on error
*/
static int mmc_send_cmd_quirks(struct mmc *mmc, struct mmc_cmd *cmd,
struct mmc_data *data, u32 quirk, uint retries)
diff --git a/drivers/mmc/mmc_private.h b/drivers/mmc/mmc_private.h
index a6cd250..b321237 100644
--- a/drivers/mmc/mmc_private.h
+++ b/drivers/mmc/mmc_private.h
@@ -91,7 +91,7 @@ static inline void mmc_trace_state(struct mmc *mmc, struct mmc_cmd *cmd)
/**
* mmc_get_next_devnum() - Get the next available MMC device number
*
- * @return next available device number (0 = first), or -ve on error
+ * Return: next available device number (0 = first), or -ve on error
*/
int mmc_get_next_devnum(void);
@@ -117,7 +117,7 @@ void mmc_list_add(struct mmc *mmc);
*
* @mmc: MMC device
* @part_num: Hardware partition number
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
*/
int mmc_switch_part(struct mmc *mmc, unsigned int part_num);
@@ -128,7 +128,7 @@ int mmc_switch_part(struct mmc *mmc, unsigned int part_num);
* @set: Unused
* @index: Cmdarg index
* @value: Cmdarg value
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
*/
int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value);
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index e2d7879..bcea800 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -83,7 +83,7 @@ struct mmc_spi_priv {
* @resp_match: if true, compare each of received bytes with @resp_match_value
* @resp_match_value: a value to be compared with each of received bytes
* @r1b: if true, receive additional bytes for busy signal token
- * @return 0 if OK, -ETIMEDOUT if no card response is received, -ve on error
+ * Return: 0 if OK, -ETIMEDOUT if no card response is received, -ve on error
*/
static int mmc_spi_sendcmd(struct udevice *dev,
ushort cmdidx, u32 cmdarg, u32 resp_type,
@@ -181,7 +181,7 @@ static int mmc_spi_sendcmd(struct udevice *dev,
* @xbuf: buffer of the actual data (excluding token and crc) to read
* @bcnt: number of data blocks to transfer
* @bsize: size of the actual data (excluding token and crc) in bytes
- * @return 0 if OK, -ECOMM if crc error, -ETIMEDOUT on other errors
+ * Return: 0 if OK, -ECOMM if crc error, -ETIMEDOUT on other errors
*/
static int mmc_spi_readdata(struct udevice *dev,
void *xbuf, u32 bcnt, u32 bsize)
@@ -239,7 +239,7 @@ static int mmc_spi_readdata(struct udevice *dev,
* @bcnt: number of data blocks to transfer
* @bsize: size of actual data (excluding token and crc) in bytes
* @multi: indicate a transfer by multiple block write command (CMD25)
- * @return 0 if OK, -ECOMM if crc error, -ETIMEDOUT on other errors
+ * Return: 0 if OK, -ECOMM if crc error, -ETIMEDOUT on other errors
*/
static int mmc_spi_writedata(struct udevice *dev, const void *xbuf,
u32 bcnt, u32 bsize, int multi)
diff --git a/drivers/mmc/octeontx_hsmmc.c b/drivers/mmc/octeontx_hsmmc.c
index 2e569a9..f0519f0 100644
--- a/drivers/mmc/octeontx_hsmmc.c
+++ b/drivers/mmc/octeontx_hsmmc.c
@@ -780,7 +780,7 @@ static const struct octeontx_sd_mods octeontx_cr_types[] = {
* @param mmc mmc device
* @param cmd command information
*
- * @return octeontx_mmc_cr_mods data structure with various quirks and flags
+ * Return: octeontx_mmc_cr_mods data structure with various quirks and flags
*/
static struct octeontx_mmc_cr_mods
octeontx_mmc_get_cr_mods(struct mmc *mmc, const struct mmc_cmd *cmd,
@@ -993,7 +993,7 @@ static void octeontx_mmc_start_dma(struct mmc *mmc, bool write,
* @param mmc mmc device
* @param timeout timeout in ms
*
- * @return 0 for success (could be DMA errors), -ETIMEDOUT on timeout
+ * Return: 0 for success (could be DMA errors), -ETIMEDOUT on timeout
*/
/**
@@ -1042,7 +1042,7 @@ static void octeontx_mmc_cleanup_dma(struct mmc *mmc,
* @param timeout timeout in ms
* @param verbose true to print out error information
*
- * @return 0 for success (could be DMA errors), -ETIMEDOUT on timeout
+ * Return: 0 for success (could be DMA errors), -ETIMEDOUT on timeout
* or -EIO if IO error.
*/
static int octeontx_mmc_wait_dma(struct mmc *mmc, bool write, ulong timeout,
@@ -1140,7 +1140,7 @@ static int octeontx_mmc_wait_dma(struct mmc *mmc, bool write, ulong timeout,
* @param data data for read
* @param verbose true to print out error information
*
- * @return number of blocks read or 0 if error
+ * Return: number of blocks read or 0 if error
*/
static int octeontx_mmc_read_blocks(struct mmc *mmc, struct mmc_cmd *cmd,
struct mmc_data *data, bool verbose)
@@ -1342,7 +1342,7 @@ static ulong octeontx_mmc_write_blocks(struct mmc *mmc, struct mmc_cmd *cmd,
* @param cmd cmd to send and response
* @param data additional data
* @param flags
- * @return 0 for success, otherwise error
+ * Return: 0 for success, otherwise error
*/
static int octeontx_mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
struct mmc_data *data)
@@ -2021,7 +2021,7 @@ struct adj adj[] = {
* @param adj parameter to tune
* @param opcode command opcode to use
*
- * @return 0 for success, -1 if tuning failed
+ * Return: 0 for success, -1 if tuning failed
*/
static int octeontx_mmc_adjust_tuning(struct mmc *mmc, struct adj *adj,
u32 opcode)
@@ -2426,7 +2426,7 @@ static void octeontx_mmc_set_emm_timing(struct mmc *mmc,
* Calculate the clock period with rounding up
*
* @param mmc mmc device
- * @return clock period in system clocks for clk_lo + clk_hi
+ * Return: clock period in system clocks for clk_lo + clk_hi
*/
static u32 octeontx_mmc_calc_clk_period(struct mmc *mmc)
{
@@ -2916,7 +2916,7 @@ static void do_switch(struct mmc *mmc, union mio_emm_switch emm_switch)
*
* @param mmc Pointer to mmc data structure
*
- * @return 0 for success or -ETIMEDOUT on error
+ * Return: 0 for success or -ETIMEDOUT on error
*
* NOTE: On error a default value will be calculated.
*/
@@ -2942,7 +2942,7 @@ static int octeontx_mmc_calibrate_delay(struct mmc *mmc)
* @param mmc mmc data structure
* @param delay delay in picoseconds
*
- * @return Number of tap cycles or error if -1
+ * Return: Number of tap cycles or error if -1
*/
static int octeontx2_mmc_calc_delay(struct mmc *mmc, int delay)
{
@@ -3136,7 +3136,7 @@ static int octeontx_mmc_set_input_bus_timing(struct mmc *mmc)
*
* @param mmc mmc data structure
*
- * @return 0 for success, error otherwise
+ * Return: 0 for success, error otherwise
*/
static int octeontx_mmc_set_output_bus_timing(struct mmc *mmc)
{
@@ -3369,7 +3369,7 @@ static void octeontx_mmc_switch_to(struct mmc *mmc)
*
* @param mmc mmc device
*
- * @return 0 for success
+ * Return: 0 for success
*
* NOTE: This will need to be updated when new silicon comes out
*/
@@ -3395,7 +3395,7 @@ static int octeontx_mmc_init_timing(struct mmc *mmc)
*
* @param mmc mmc device
*
- * @return 0 for success, error otherwise
+ * Return: 0 for success, error otherwise
*/
static int octeontx_mmc_init_lowlevel(struct mmc *mmc)
{
@@ -3453,7 +3453,7 @@ static int octeontx_mmc_init_lowlevel(struct mmc *mmc)
*
* @param voltage voltage in microvolts
*
- * @return MMC register value for voltage
+ * Return: MMC register value for voltage
*/
static u32 xlate_voltage(u32 voltage)
{
@@ -3506,7 +3506,7 @@ static u32 xlate_voltage(u32 voltage)
*
* @param dev slot device to check
*
- * @return true if status reports "ok" or "okay" or if no status,
+ * Return: true if status reports "ok" or "okay" or if no status,
* false otherwise.
*/
static bool octeontx_mmc_get_valid(struct udevice *dev)
@@ -3524,7 +3524,7 @@ static bool octeontx_mmc_get_valid(struct udevice *dev)
*
* @param dev slot device
*
- * @return 0 on success, otherwise error
+ * Return: 0 on success, otherwise error
*/
static int octeontx_mmc_get_config(struct udevice *dev)
{
@@ -3705,7 +3705,7 @@ static int octeontx_mmc_get_config(struct udevice *dev)
*
* @param dev mmc device
*
- * @return 0 for success, error otherwise
+ * Return: 0 for success, error otherwise
*/
static int octeontx_mmc_slot_probe(struct udevice *dev)
{
@@ -3802,7 +3802,7 @@ U_BOOT_DRIVER(octeontx_hsmmc_slot) = {
*
* @param dev mmc host controller device
*
- * @return 0 for success, -1 on error
+ * Return: 0 for success, -1 on error
*/
static int octeontx_mmc_host_probe(struct udevice *dev)
{
@@ -3910,7 +3910,7 @@ static int octeontx_mmc_host_probe(struct udevice *dev)
*
* @param dev: MMC slot device
*
- * @return 0 for success, -1 on failure
+ * Return: 0 for success, -1 on failure
*
* Do some pre-initialization before probing a slot.
*/
diff --git a/drivers/mmc/sdhci-adma.c b/drivers/mmc/sdhci-adma.c
index 2ec057f..8213223 100644
--- a/drivers/mmc/sdhci-adma.c
+++ b/drivers/mmc/sdhci-adma.c
@@ -64,7 +64,7 @@ void sdhci_prepare_adma_table(struct sdhci_adma_desc *table,
/**
* sdhci_adma_init() - initialize the ADMA descriptor table
*
- * @return pointer to the allocated descriptor table or NULL in case of an
+ * Return: pointer to the allocated descriptor table or NULL in case of an
* error.
*/
struct sdhci_adma_desc *sdhci_adma_init(void)