Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: PL08x: fix spelling errors

Browse Source 
Correct mis-spellings in comments and printk strings.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Russell King - ARM Linux 2011-01-03 22:30:24 +00:00 committed by Dan Williams
parent e8a7e48bb2
commit e8b5e11df3
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/dma/amba-pl08x.c
View File

@ -19,7 +19,7 @@
* this program; if not, write to the Free Software Foundation, Inc., 59 * this program; if not, write to the Free Software Foundation, Inc., 59
* Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* The full GNU General Public License is iin this distribution in the * The full GNU General Public License is in this distribution in the
* file called COPYING. * file called COPYING.
* *
* Documentation: ARM DDI 0196G == PL080 * Documentation: ARM DDI 0196G == PL080
@ -82,7 +82,7 @@
/** /**
* struct vendor_data - vendor-specific config parameters * struct vendor_data - vendor-specific config parameters
* for PL08x derivates * for PL08x derivatives
* @name: the name of this specific variant * @name: the name of this specific variant
* @channels: the number of channels available in this variant * @channels: the number of channels available in this variant
* @dualmaster: whether this version supports dual AHB masters * @dualmaster: whether this version supports dual AHB masters
@ -96,10 +96,8 @@ struct vendor_data {
/* /*
* PL08X private data structures * PL08X private data structures
* An LLI struct - see pl08x TRM * An LLI struct - see PL08x TRM. Note that next uses bit[0] as a bus bit,
* Note that next uses bit[0] as a bus bit, * start & end do not - their bus bit info is in cctl.
* start & end do not - their bus bit info
* is in cctl
*/ */
struct lli { struct lli {
dma_addr_t src; dma_addr_t src;
@ -152,7 +150,7 @@ struct pl08x_driver_data {
/* Size (bytes) of each LLI buffer allocated for one transfer */ /* Size (bytes) of each LLI buffer allocated for one transfer */
# define PL08X_LLI_TSFR_SIZE 0x2000 # define PL08X_LLI_TSFR_SIZE 0x2000
/* Maximimum times we call dma_pool_alloc on this pool without freeing */ /* Maximum times we call dma_pool_alloc on this pool without freeing */
#define PL08X_MAX_ALLOCS 0x40 #define PL08X_MAX_ALLOCS 0x40
#define MAX_NUM_TSFR_LLIS (PL08X_LLI_TSFR_SIZE/sizeof(struct lli)) #define MAX_NUM_TSFR_LLIS (PL08X_LLI_TSFR_SIZE/sizeof(struct lli))
#define PL08X_ALIGN 8 #define PL08X_ALIGN 8
@ -177,7 +175,7 @@ static int pl08x_phy_channel_busy(struct pl08x_phy_chan *ch)
/* /*
* Set the initial DMA register values i.e. those for the first LLI * Set the initial DMA register values i.e. those for the first LLI
* The next lli pointer and the configuration interrupt bit have * The next LLI pointer and the configuration interrupt bit have
* been set when the LLIs were constructed * been set when the LLIs were constructed
*/ */
static void pl08x_set_cregs(struct pl08x_driver_data *pl08x, static void pl08x_set_cregs(struct pl08x_driver_data *pl08x,
@ -366,8 +364,7 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan)
while (clli) { while (clli) {
bytes += get_bytes_in_cctl(llis_va[i].cctl); bytes += get_bytes_in_cctl(llis_va[i].cctl);
/* /*
* A clli of 0x00000000 will terminate the * A LLI pointer of 0 terminates the LLI list
* LLI list
*/ */
clli = llis_va[i].next; clli = llis_va[i].next;
i++; i++;
@ -469,7 +466,7 @@ static inline u32 pl08x_cctl_bits(u32 cctl, u8 srcwidth, u8 dstwidth,
{ {
u32 retbits = cctl; u32 retbits = cctl;
/* Remove all src, dst and transfersize bits */ /* Remove all src, dst and transfer size bits */
retbits &= ~PL080_CONTROL_DWIDTH_MASK; retbits &= ~PL080_CONTROL_DWIDTH_MASK;
retbits &= ~PL080_CONTROL_SWIDTH_MASK; retbits &= ~PL080_CONTROL_SWIDTH_MASK;
retbits &= ~PL080_CONTROL_TRANSFER_SIZE_MASK; retbits &= ~PL080_CONTROL_TRANSFER_SIZE_MASK;
@ -701,7 +698,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
* Choose bus to align to * Choose bus to align to
* - prefers destination bus if both available * - prefers destination bus if both available
* - if fixed address on one bus chooses other * - if fixed address on one bus chooses other
* - modifies cctl to choose an apropriate master * - modifies cctl to choose an appropriate master
*/ */
pl08x_choose_master_bus(&txd->srcbus, &txd->dstbus, pl08x_choose_master_bus(&txd->srcbus, &txd->dstbus,
&mbus, &sbus, cctl); &mbus, &sbus, cctl);
@ -775,7 +772,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
target_len = max_bytes_per_lli; target_len = max_bytes_per_lli;
/* /*
* Set bus lengths for incrementing busses * Set bus lengths for incrementing buses
* to number of bytes which fill to next memory * to number of bytes which fill to next memory
* boundary * boundary
*/ */
@ -826,7 +823,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
/* /*
* So now we know how many bytes to transfer * So now we know how many bytes to transfer
* to get to the nearest boundary * to get to the nearest boundary
* The next lli will past the boundary * The next LLI will past the boundary
* - however we may be working to a boundary * - however we may be working to a boundary
* on the slave bus * on the slave bus
* We need to ensure the master stays aligned * We need to ensure the master stays aligned
@ -884,7 +881,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
&& (remainder); j++) { && (remainder); j++) {
cctl = pl08x_cctl_bits(cctl, 1, 1, 1); cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
dev_vdbg(&pl08x->adev->dev, dev_vdbg(&pl08x->adev->dev,
"%s align with boundardy, single byte (remain %08x)\n", "%s align with boundary, single byte (remain %08x)\n",
__func__, remainder); __func__, remainder);
num_llis = num_llis =
pl08x_fill_lli_for_desc(pl08x, pl08x_fill_lli_for_desc(pl08x,
@ -907,7 +904,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
while (remainder) { while (remainder) {
cctl = pl08x_cctl_bits(cctl, 1, 1, 1); cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
dev_vdbg(&pl08x->adev->dev, dev_vdbg(&pl08x->adev->dev,
"%s align with boundardy, single odd byte (remain %d)\n", "%s align with boundary, single odd byte (remain %d)\n",
__func__, remainder); __func__, remainder);
num_llis = pl08x_fill_lli_for_desc(pl08x, txd, num_llis, num_llis = pl08x_fill_lli_for_desc(pl08x, txd, num_llis,
1, cctl, &remainder); 1, cctl, &remainder);
@ -1367,8 +1364,8 @@ static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan,
* available to handle it whereas slave transfers may * available to handle it whereas slave transfers may
* have been denied due to platform channel muxing restrictions * have been denied due to platform channel muxing restrictions
* and since there is no guarantee that this will ever be * and since there is no guarantee that this will ever be
* resolved, and since the signal must be aquired AFTER * resolved, and since the signal must be acquired AFTER
* aquiring the physical channel, we will let them be NACK:ed * acquiring the physical channel, we will let them be NACK:ed
* with -EBUSY here. The drivers can alway retry the prep() * with -EBUSY here. The drivers can alway retry the prep()
* call if they are eager on doing this using DMA. * call if they are eager on doing this using DMA.
*/ */
@ -1620,7 +1617,7 @@ static void pl08x_ensure_on(struct pl08x_driver_data *pl08x)
val = readl(pl08x->base + PL080_CONFIG); val = readl(pl08x->base + PL080_CONFIG);
val &= ~(PL080_CONFIG_M2_BE | PL080_CONFIG_M1_BE | PL080_CONFIG_ENABLE); val &= ~(PL080_CONFIG_M2_BE | PL080_CONFIG_M1_BE | PL080_CONFIG_ENABLE);
/* We implictly clear bit 1 and that means little-endian mode */ /* We implicitly clear bit 1 and that means little-endian mode */
val |= PL080_CONFIG_ENABLE; val |= PL080_CONFIG_ENABLE;
writel(val, pl08x->base + PL080_CONFIG); writel(val, pl08x->base + PL080_CONFIG);
} }
@ -2160,7 +2157,7 @@ static int __init pl08x_init(void)
retval = amba_driver_register(&pl08x_amba_driver); retval = amba_driver_register(&pl08x_amba_driver);
if (retval) if (retval)
printk(KERN_WARNING DRIVER_NAME printk(KERN_WARNING DRIVER_NAME
"failed to register as an amba device (%d)\n", "failed to register as an AMBA device (%d)\n",
retval); retval);
return retval; return retval;
} }