提交 4b514fa2 编写于 作者: A Alexey Roslyakov 提交者: Ulf Hansson

mmc: dw_mmc: update kernel-doc comments for dw_mci

cur_slot and num_slots has been removed from struct dw_mci in 42f989c0.
Unfortunately, inline documentation was not updated so far.

Fix @lock field documentation in Locking section.
Move @mrq field of struct dw_mci_slot mention closer to it
description, so no one could miss this slightest detail.

Couple of code style fixes as a bonus.
Signed-off-by: NAlexey Roslyakov <alexey.roslyakov@gmail.com>
Reviewed-by: NShawn Lin <shawn.lin@rock-chips.com>
Acked-by: NJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: NUlf Hansson <ulf.hansson@linaro.org>
上级 ec10ab57
...@@ -65,8 +65,7 @@ struct dw_mci_dma_slave { ...@@ -65,8 +65,7 @@ struct dw_mci_dma_slave {
* @fifo_reg: Pointer to MMIO registers for data FIFO * @fifo_reg: Pointer to MMIO registers for data FIFO
* @sg: Scatterlist entry currently being processed by PIO code, if any. * @sg: Scatterlist entry currently being processed by PIO code, if any.
* @sg_miter: PIO mapping scatterlist iterator. * @sg_miter: PIO mapping scatterlist iterator.
* @cur_slot: The slot which is currently using the controller. * @mrq: The request currently being processed on @slot,
* @mrq: The request currently being processed on @cur_slot,
* or NULL if the controller is idle. * or NULL if the controller is idle.
* @cmd: The command currently being sent to the card, or NULL. * @cmd: The command currently being sent to the card, or NULL.
* @data: The data currently being transferred, or NULL if no data * @data: The data currently being transferred, or NULL if no data
...@@ -102,7 +101,6 @@ struct dw_mci_dma_slave { ...@@ -102,7 +101,6 @@ struct dw_mci_dma_slave {
* @bus_hz: The rate of @mck in Hz. This forms the basis for MMC bus * @bus_hz: The rate of @mck in Hz. This forms the basis for MMC bus
* rate and timeout calculations. * rate and timeout calculations.
* @current_speed: Configured rate of the controller. * @current_speed: Configured rate of the controller.
* @num_slots: Number of slots available.
* @fifoth_val: The value of FIFOTH register. * @fifoth_val: The value of FIFOTH register.
* @verid: Denote Version ID. * @verid: Denote Version ID.
* @dev: Device associated with the MMC controller. * @dev: Device associated with the MMC controller.
...@@ -134,17 +132,17 @@ struct dw_mci_dma_slave { ...@@ -134,17 +132,17 @@ struct dw_mci_dma_slave {
* ======= * =======
* *
* @lock is a softirq-safe spinlock protecting @queue as well as * @lock is a softirq-safe spinlock protecting @queue as well as
* @slot, @mrq and @state. These must always be updated
* at the same time while holding @lock. * at the same time while holding @lock.
* The @mrq field of struct dw_mci_slot is also protected by @lock,
* and must always be written at the same time as the slot is added to
* @queue.
* *
* @irq_lock is an irq-safe spinlock protecting the INTMASK register * @irq_lock is an irq-safe spinlock protecting the INTMASK register
* to allow the interrupt handler to modify it directly. Held for only long * to allow the interrupt handler to modify it directly. Held for only long
* enough to read-modify-write INTMASK and no other locks are grabbed when * enough to read-modify-write INTMASK and no other locks are grabbed when
* holding this one. * holding this one.
* *
* The @mrq field of struct dw_mci_slot is also protected by @lock,
* and must always be written at the same time as the slot is added to
* @queue.
*
* @pending_events and @completed_events are accessed using atomic bit * @pending_events and @completed_events are accessed using atomic bit
* operations, so they don't need any locking. * operations, so they don't need any locking.
* *
...@@ -321,8 +319,8 @@ struct dw_mci_board { ...@@ -321,8 +319,8 @@ struct dw_mci_board {
#define SDMMC_ENABLE_SHIFT 0x110 #define SDMMC_ENABLE_SHIFT 0x110
#define SDMMC_DATA(x) (x) #define SDMMC_DATA(x) (x)
/* /*
* Registers to support idmac 64-bit address mode * Registers to support idmac 64-bit address mode
*/ */
#define SDMMC_DBADDRL 0x088 #define SDMMC_DBADDRL 0x088
#define SDMMC_DBADDRU 0x08c #define SDMMC_DBADDRU 0x08c
#define SDMMC_IDSTS64 0x090 #define SDMMC_IDSTS64 0x090
...@@ -449,7 +447,8 @@ struct dw_mci_board { ...@@ -449,7 +447,8 @@ struct dw_mci_board {
(SDMMC_CTRL_RESET | SDMMC_CTRL_FIFO_RESET | SDMMC_CTRL_DMA_RESET) (SDMMC_CTRL_RESET | SDMMC_CTRL_FIFO_RESET | SDMMC_CTRL_DMA_RESET)
/* FIFO register access macros. These should not change the data endian-ness /* FIFO register access macros. These should not change the data endian-ness
* as they are written to memory to be dealt with by the upper layers */ * as they are written to memory to be dealt with by the upper layers
*/
#define mci_fifo_readw(__reg) __raw_readw(__reg) #define mci_fifo_readw(__reg) __raw_readw(__reg)
#define mci_fifo_readl(__reg) __raw_readl(__reg) #define mci_fifo_readl(__reg) __raw_readl(__reg)
#define mci_fifo_readq(__reg) __raw_readq(__reg) #define mci_fifo_readq(__reg) __raw_readq(__reg)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册