mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits) doc: fix typo in comment explaining rb_tree usage Remove fs/ntfs/ChangeLog doc: fix console doc typo doc: cpuset: Update the cpuset flag file Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed Remove drivers/parport/ChangeLog Remove drivers/char/ChangeLog doc: typo - Table 1-2 should refer to "status", not "statm" tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h devres/irq: Fix devm_irq_match comment Remove reference to kthread_create_on_cpu tree-wide: Assorted spelling fixes tree-wide: fix 'lenght' typo in comments and code drm/kms: fix spelling in error message doc: capitalization and other minor fixes in pnp doc devres: typo fix s/dev/devm/ Remove redundant trailing semicolons from macros fix typo "definetly" -> "definitely" in comment tree-wide: s/widht/width/g typo in comments ... Fix trivial conflict in Documentation/laptops/00-INDEX
This commit is contained in:
commit
c32da02342
246 changed files with 396 additions and 3454 deletions
|
|
@ -274,7 +274,7 @@ static irqreturn_t davinci_interrupt(int irq, void *__hci)
|
|||
/* NOTE: DaVinci shadows the Mentor IRQs. Don't manage them through
|
||||
* the Mentor registers (except for setup), use the TI ones and EOI.
|
||||
*
|
||||
* Docs describe irq "vector" registers asociated with the CPPI and
|
||||
* Docs describe irq "vector" registers associated with the CPPI and
|
||||
* USB EOI registers. These hold a bitmask corresponding to the
|
||||
* current IRQ, not an irq handler address. Would using those bits
|
||||
* resolve some of the races observed in this dispatch code??
|
||||
|
|
|
|||
|
|
@ -491,7 +491,7 @@ static inline u8 musb_read_txhubport(void __iomem *mbase, u8 epnum)
|
|||
#define MUSB_FLAT_OFFSET(_epnum, _offset) \
|
||||
(USB_OFFSET(USB_EP_NI0_TXMAXP) + (0x40 * (_epnum)) + (_offset))
|
||||
|
||||
/* Not implemented - HW has seperate Tx/Rx FIFO */
|
||||
/* Not implemented - HW has separate Tx/Rx FIFO */
|
||||
#define MUSB_TXCSR_MODE 0x0000
|
||||
|
||||
static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size)
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ struct cypress_private {
|
|||
int isthrottled; /* if throttled, discard reads */
|
||||
wait_queue_head_t delta_msr_wait; /* used for TIOCMIWAIT */
|
||||
char prev_status, diff_status; /* used for TIOCMIWAIT */
|
||||
/* we pass a pointer to this as the arguement sent to
|
||||
/* we pass a pointer to this as the argument sent to
|
||||
cypress_set_termios old_termios */
|
||||
struct ktermios tmp_termios; /* stores the old termios settings */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ static void opticon_bulk_callback(struct urb *urb)
|
|||
}
|
||||
} else {
|
||||
dev_dbg(&priv->udev->dev,
|
||||
"Improper ammount of data received from the device, "
|
||||
"Improper amount of data received from the device, "
|
||||
"%d bytes", urb->actual_length);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ static void symbol_int_callback(struct urb *urb)
|
|||
}
|
||||
} else {
|
||||
dev_dbg(&priv->udev->dev,
|
||||
"Improper ammount of data received from the device, "
|
||||
"Improper amount of data received from the device, "
|
||||
"%d bytes", urb->actual_length);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ struct wusb_port {
|
|||
* ports) this HC will take. Read-only.
|
||||
*
|
||||
* @port Array of port status for each fake root port. Guaranteed to
|
||||
* always be the same lenght during device existence
|
||||
* always be the same length during device existence
|
||||
* [this allows for some unlocked but referenced reading].
|
||||
*
|
||||
* @mmcies_max Max number of Information Elements this HC can send
|
||||
|
|
|
|||
Loading…
Reference in a new issue