Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "As usual, mostly comment, kerneldoc and printk() fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: lpfc: Grammar s/an negative/a negative/ ARM: lib/lib1funcs.S: fix typo s/substractions/subtractions/ cx25821: cx25821-medusa-reg.h: fix 0x0x prefix lib: crc-itu-t.[ch] fix 0x0x prefix in integer constants rapidio: Fix kerneldoc and comment qla4xxx: Fix printk() in qla4_83xx_read_reset_template() and qla4_83xx_pre_loopback_config() treewide: Kconfig: fix wording / spelling usb/serial: fix grammar in Kconfig help text for FTDI_SIO megaraid_sas: fix kerneldoc netfilter: ebtables: fix comment grammar drm/radeon: fix comment isdn: fix grammar in comment ARM: KVM: fix comment
This commit is contained in:
Коммит
cb8a4deaf9
|
@ -23,7 +23,7 @@
|
|||
#define c0_MPIDR 1 /* MultiProcessor ID Register */
|
||||
#define c0_CSSELR 2 /* Cache Size Selection Register */
|
||||
#define c1_SCTLR 3 /* System Control Register */
|
||||
#define c1_ACTLR 4 /* Auxilliary Control Register */
|
||||
#define c1_ACTLR 4 /* Auxiliary Control Register */
|
||||
#define c1_CPACR 5 /* Coprocessor Access Control */
|
||||
#define c2_TTBR0 6 /* Translation Table Base Register 0 */
|
||||
#define c2_TTBR0_high 7 /* TTBR0 top 32 bits */
|
||||
|
|
|
@ -167,7 +167,7 @@ Boston, MA 02111-1307, USA. */
|
|||
|
||||
#endif
|
||||
|
||||
@ Perform all needed substractions to keep only the reminder.
|
||||
@ Perform all needed subtractions to keep only the reminder.
|
||||
@ Do comparisons in batch of 4 first.
|
||||
subs \order, \order, #3 @ yes, 3 is intended here
|
||||
blt 2f
|
||||
|
@ -189,7 +189,7 @@ Boston, MA 02111-1307, USA. */
|
|||
teqne \dividend, #0
|
||||
beq 5f
|
||||
|
||||
@ Either 1, 2 or 3 comparison/substractions are left.
|
||||
@ Either 1, 2 or 3 comparison/subtractions are left.
|
||||
2: cmn \order, #2
|
||||
blt 4f
|
||||
beq 3f
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#define MPIDR_EL1 1 /* MultiProcessor Affinity Register */
|
||||
#define CSSELR_EL1 2 /* Cache Size Selection Register */
|
||||
#define SCTLR_EL1 3 /* System Control Register */
|
||||
#define ACTLR_EL1 4 /* Auxilliary Control Register */
|
||||
#define ACTLR_EL1 4 /* Auxiliary Control Register */
|
||||
#define CPACR_EL1 5 /* Coprocessor Access Control */
|
||||
#define TTBR0_EL1 6 /* Translation Table Base Register 0 */
|
||||
#define TTBR1_EL1 7 /* Translation Table Base Register 1 */
|
||||
|
|
|
@ -151,7 +151,7 @@ config HAVE_SMP
|
|||
the CPU core definition and currently needs to be selected manually.
|
||||
|
||||
Multiprocessor support in implemented with external cache and
|
||||
interrupt controlers.
|
||||
interrupt controllers.
|
||||
|
||||
The MX interrupt distributer adds Interprocessor Interrupts
|
||||
and causes the IRQ numbers to be increased by 4 for devices
|
||||
|
|
|
@ -7944,8 +7944,8 @@ typedef struct {
|
|||
typedef struct {
|
||||
AMD_ACPI_DESCRIPTION_HEADER SHeader;
|
||||
UCHAR TableUUID[16]; //0x24
|
||||
ULONG VBIOSImageOffset; //0x34. Offset to the first GOP_VBIOS_CONTENT block from the beginning of the stucture.
|
||||
ULONG Lib1ImageOffset; //0x38. Offset to the first GOP_LIB1_CONTENT block from the beginning of the stucture.
|
||||
ULONG VBIOSImageOffset; //0x34. Offset to the first GOP_VBIOS_CONTENT block from the beginning of the structure.
|
||||
ULONG Lib1ImageOffset; //0x38. Offset to the first GOP_LIB1_CONTENT block from the beginning of the structure.
|
||||
ULONG Reserved[4]; //0x3C
|
||||
}UEFI_ACPI_VFCT;
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
* About SOFTNET:
|
||||
* Most of the changes were pretty obvious and basically done by HE already.
|
||||
*
|
||||
* One problem of the isdn net device code is that is uses struct net_device
|
||||
* One problem of the isdn net device code is that it uses struct net_device
|
||||
* for masters and slaves. However, only master interface are registered to
|
||||
* the network layer, and therefore, it only makes sense to call netif_*
|
||||
* functions on them.
|
||||
|
|
|
@ -84,9 +84,9 @@
|
|||
#define ABIST_BIN4_VGA3 0x01D4
|
||||
#define ABIST_BIN5_VGA4 0x01D8
|
||||
#define ABIST_BIN6_VGA5 0x01DC
|
||||
#define ABIST_BIN7_VGA6 0x0x1E0
|
||||
#define ABIST_CLAMP_A 0x0x1E4
|
||||
#define ABIST_CLAMP_B 0x0x1E8
|
||||
#define ABIST_BIN7_VGA6 0x01E0
|
||||
#define ABIST_CLAMP_A 0x01E4
|
||||
#define ABIST_CLAMP_B 0x01E8
|
||||
#define ABIST_CLAMP_C 0x01EC
|
||||
#define ABIST_CLAMP_D 0x01F0
|
||||
#define ABIST_CLAMP_E 0x01F4
|
||||
|
|
|
@ -660,7 +660,7 @@ config TOSHIBA_HAPS
|
|||
depends on ACPI
|
||||
---help---
|
||||
This driver adds support for the built-in accelerometer
|
||||
found on recent Toshiba laptops equiped with HID TOS620A
|
||||
found on recent Toshiba laptops equipped with HID TOS620A
|
||||
device.
|
||||
|
||||
This driver receives ACPI notify events 0x80 when the sensor
|
||||
|
@ -669,7 +669,7 @@ config TOSHIBA_HAPS
|
|||
been stabilized.
|
||||
|
||||
Also provides sysfs entries to get/set the desired protection
|
||||
level and reseting the HDD protection interface.
|
||||
level and resetting the HDD protection interface.
|
||||
|
||||
If you have a recent Toshiba laptop with a built-in accelerometer
|
||||
device, say Y.
|
||||
|
|
|
@ -83,7 +83,7 @@ static u16 rio_destid_alloc(struct rio_net *net)
|
|||
* @destid: destID to reserve
|
||||
*
|
||||
* Tries to reserve the specified destID.
|
||||
* Returns 0 if successfull.
|
||||
* Returns 0 if successful.
|
||||
*/
|
||||
static int rio_destid_reserve(struct rio_net *net, u16 destid)
|
||||
{
|
||||
|
|
|
@ -52,7 +52,7 @@ config SCSI_MQ_DEFAULT
|
|||
This option enables the new blk-mq based I/O path for SCSI
|
||||
devices by default. With the option the scsi_mod.use_blk_mq
|
||||
module/boot option defaults to Y, without it to N, but it can
|
||||
still be overriden either way.
|
||||
still be overridden either way.
|
||||
|
||||
If unsure say N.
|
||||
|
||||
|
|
|
@ -710,7 +710,7 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
|
|||
* returns a pointer to that log in the private_data field in @file.
|
||||
*
|
||||
* Returns:
|
||||
* This function returns zero if successful. On error it will return an negative
|
||||
* This function returns zero if successful. On error it will return a negative
|
||||
* error value.
|
||||
**/
|
||||
static int
|
||||
|
@ -760,7 +760,7 @@ out:
|
|||
* returns a pointer to that log in the private_data field in @file.
|
||||
*
|
||||
* Returns:
|
||||
* This function returns zero if successful. On error it will return an negative
|
||||
* This function returns zero if successful. On error it will return a negative
|
||||
* error value.
|
||||
**/
|
||||
static int
|
||||
|
@ -810,7 +810,7 @@ out:
|
|||
* returns a pointer to that log in the private_data field in @file.
|
||||
*
|
||||
* Returns:
|
||||
* This function returns zero if successful. On error it will return an negative
|
||||
* This function returns zero if successful. On error it will return a negative
|
||||
* error value.
|
||||
**/
|
||||
static int
|
||||
|
@ -852,7 +852,7 @@ out:
|
|||
* returns a pointer to that log in the private_data field in @file.
|
||||
*
|
||||
* Returns:
|
||||
* This function returns zero if successful. On error it will return an negative
|
||||
* This function returns zero if successful. On error it will return a negative
|
||||
* error value.
|
||||
**/
|
||||
static int
|
||||
|
@ -894,7 +894,7 @@ out:
|
|||
* returns a pointer to that log in the private_data field in @file.
|
||||
*
|
||||
* Returns:
|
||||
* This function returns zero if successful. On error it will return an negative
|
||||
* This function returns zero if successful. On error it will return a negative
|
||||
* error value.
|
||||
**/
|
||||
static int
|
||||
|
@ -1115,7 +1115,7 @@ lpfc_debugfs_dif_err_release(struct inode *inode, struct file *file)
|
|||
* returns a pointer to that log in the private_data field in @file.
|
||||
*
|
||||
* Returns:
|
||||
* This function returns zero if successful. On error it will return an negative
|
||||
* This function returns zero if successful. On error it will return a negative
|
||||
* error value.
|
||||
**/
|
||||
static int
|
||||
|
|
|
@ -4747,7 +4747,7 @@ fail_ready_state:
|
|||
|
||||
/**
|
||||
* megasas_release_mfi - Reverses the FW initialization
|
||||
* @intance: Adapter soft state
|
||||
* @instance: Adapter soft state
|
||||
*/
|
||||
static void megasas_release_mfi(struct megasas_instance *instance)
|
||||
{
|
||||
|
|
|
@ -2334,7 +2334,7 @@ megasas_issue_dcmd_fusion(struct megasas_instance *instance,
|
|||
|
||||
/**
|
||||
* megasas_release_fusion - Reverses the FW initialization
|
||||
* @intance: Adapter soft state
|
||||
* @instance: Adapter soft state
|
||||
*/
|
||||
void
|
||||
megasas_release_fusion(struct megasas_instance *instance)
|
||||
|
|
|
@ -828,7 +828,7 @@ void qla4_83xx_read_reset_template(struct scsi_qla_host *ha)
|
|||
ret_val = qla4_83xx_flash_read_u32(ha, addr, p_buff,
|
||||
tmplt_hdr_def_size);
|
||||
if (ret_val != QLA_SUCCESS) {
|
||||
ql4_printk(KERN_ERR, ha, "%s: Failed to read reset tempelate\n",
|
||||
ql4_printk(KERN_ERR, ha, "%s: Failed to read reset template\n",
|
||||
__func__);
|
||||
goto exit_read_template_error;
|
||||
}
|
||||
|
|
|
@ -571,7 +571,7 @@ static int qla4_83xx_pre_loopback_config(struct scsi_qla_host *ha,
|
|||
|
||||
if ((config & ENABLE_INTERNAL_LOOPBACK) ||
|
||||
(config & ENABLE_EXTERNAL_LOOPBACK)) {
|
||||
ql4_printk(KERN_INFO, ha, "%s: Loopback diagnostics already in progress. Invalid requiest\n",
|
||||
ql4_printk(KERN_INFO, ha, "%s: Loopback diagnostics already in progress. Invalid request\n",
|
||||
__func__);
|
||||
goto exit_pre_loopback_config;
|
||||
}
|
||||
|
|
|
@ -171,7 +171,7 @@ config USB_SERIAL_FTDI_SIO
|
|||
---help---
|
||||
Say Y here if you want to use a FTDI SIO single port USB to serial
|
||||
converter device. The implementation I have is called the USC-1000.
|
||||
This driver has also be tested with the 245 and 232 devices.
|
||||
This driver has also been tested with the 245 and 232 devices.
|
||||
|
||||
See <http://ftdi-usb-sio.sourceforge.net/> for more
|
||||
information on this driver and the device.
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* Implements the standard CRC ITU-T V.41:
|
||||
* Width 16
|
||||
* Poly 0x0x1021 (x^16 + x^12 + x^15 + 1)
|
||||
* Poly 0x1021 (x^16 + x^12 + x^15 + 1)
|
||||
* Init 0
|
||||
*
|
||||
* This source code is licensed under the GNU General Public License,
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* ebtables.c,v 2.0, April, 2002
|
||||
*
|
||||
* This code is stongly inspired on the iptables code which is
|
||||
* This code is strongly inspired by the iptables code which is
|
||||
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
|
||||
*/
|
||||
#ifndef __LINUX_BRIDGE_EFF_H
|
||||
|
|
|
@ -298,7 +298,7 @@ struct rio_id_table {
|
|||
* struct rio_net - RIO network info
|
||||
* @node: Node in global list of RIO networks
|
||||
* @devices: List of devices in this network
|
||||
* @switches: List of switches in this netowrk
|
||||
* @switches: List of switches in this network
|
||||
* @mports: List of master ports accessing this network
|
||||
* @hport: Default port for accessing this network
|
||||
* @id: RIO network ID
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* ebtables.c,v 2.0, April, 2002
|
||||
*
|
||||
* This code is stongly inspired on the iptables code which is
|
||||
* This code is strongly inspired by the iptables code which is
|
||||
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
|
||||
*/
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/crc-itu-t.h>
|
||||
|
||||
/** CRC table for the CRC ITU-T V.41 0x0x1021 (x^16 + x^12 + x^15 + 1) */
|
||||
/** CRC table for the CRC ITU-T V.41 0x1021 (x^16 + x^12 + x^15 + 1) */
|
||||
const u16 crc_itu_t_table[256] = {
|
||||
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
|
||||
0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* ebtables.c,v 2.0, July, 2002
|
||||
*
|
||||
* This code is stongly inspired on the iptables code which is
|
||||
* This code is strongly inspired by the iptables code which is
|
||||
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
Загрузка…
Ссылка в новой задаче