hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull trivial tree updates from Jiri Kosina:
 "Usual rocket science -- mostly documentation and comment updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  sparse: fix comment
  doc: fix double words
  isdn: capi: fix "CAPI_VERSION" comment
  doc: DocBook: Fix typos in xml and template file
  Bluetooth: add module name for btwilink
  driver core: unexport static function create_syslog_header
  mmc: core: typo fix in printk specifier
  ARM: spear: clean up editing mistake
  net-sysfs: fix comment typo 'CONFIG_SYFS'
  doc: Insert MODULE_ in module-signing macros
  Documentation: update URL to hfsplus Technote 1150
  gpio: update path to documentation
  ixgbe: Fix format string in ixgbe_fcoe.
  Kconfig: Remove useless "default N" lines
  user_namespace.c: Remove duplicated word in comment
  CREDITS: fix formatting
  treewide: Fix typo in Documentation/DocBook
  mm: Fix warning on make htmldocs caused by slab.c
  ata: ata-samsung_cf: cleanup in header file
  idr: remove unused prototype of idr_free()
This commit is contained in:
Linus Torvalds 2014-04-02 16:23:38 -07:00
parent 05bf58ca4b c800bcd5f5
commit 159d8133d0
67 changed files with 70 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CREDITS
View File

@ -2560,7 +2560,7 @@ S: 22 Seaview St
S: Fullarton 5063 S: Fullarton 5063
S: South Australia S: South Australia
N. Wolfgang Muees N: Wolfgang Muees
E: wolfgang@iksw-muees.de E: wolfgang@iksw-muees.de
D: Auerswald USB driver D: Auerswald USB driver

2
Documentation/DocBook/media/dvb/dvbproperty.xml
View File

@ -196,7 +196,7 @@ get/set up to 64 properties. The actual meaning of each property is described on
<para>1)For satellital delivery systems, it is measured in kHz. <para>1)For satellital delivery systems, it is measured in kHz.
For the other ones, it is measured in Hz.</para> For the other ones, it is measured in Hz.</para>
<para>2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz. <para>2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz.
E.g. a valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of E.g. a valid frequency could be 474143 kHz. The stepping is bound to the bandwidth of
the channel which is 6MHz.</para> the channel which is 6MHz.</para>
<para>3)As in ISDB-Tsb the channel consists of only one or three segments the <para>3)As in ISDB-Tsb the channel consists of only one or three segments the

2
Documentation/DocBook/media/v4l/compat.xml
View File

@ -397,7 +397,7 @@ linkend="control" />.</para>
<para>The <structfield>depth</structfield> (average number of <para>The <structfield>depth</structfield> (average number of
bits per pixel) of a video image is implied by the selected image bits per pixel) of a video image is implied by the selected image
format. V4L2 does not explicitely provide such information assuming format. V4L2 does not explicitly provide such information assuming
applications recognizing the format are aware of the image depth and applications recognizing the format are aware of the image depth and
others need not know. The <structfield>palette</structfield> field others need not know. The <structfield>palette</structfield> field
moved into the &v4l2-pix-format;:<informaltable> moved into the &v4l2-pix-format;:<informaltable>

2
Documentation/DocBook/media_api.tmpl
View File

@ -58,7 +58,7 @@ Foundation. A copy of the license is included in the chapter entitled
<title>Introduction</title> <title>Introduction</title>
<para>This document covers the Linux Kernel to Userspace API's used by <para>This document covers the Linux Kernel to Userspace API's used by
video and radio straming devices, including video cameras, video and radio streaming devices, including video cameras,
analog and digital TV receiver cards, AM/FM receiver cards, analog and digital TV receiver cards, AM/FM receiver cards,
streaming capture devices.</para> streaming capture devices.</para>
<para>It is divided into four parts.</para> <para>It is divided into four parts.</para>

2
Documentation/filesystems/autofs4-mount-control.txt
View File

@ -255,7 +255,7 @@ AUTOFS_DEV_IOCTL_OPENMOUNT and AUTOFS_DEV_IOCTL_CLOSEMOUNT
Obtain and release a file descriptor for an autofs managed mount point Obtain and release a file descriptor for an autofs managed mount point
path. The open call requires an initialized struct autofs_dev_ioctl with path. The open call requires an initialized struct autofs_dev_ioctl with
the the path field set and the size field adjusted appropriately as well the path field set and the size field adjusted appropriately as well
as the arg1 field set to the device number of the autofs mount. The as the arg1 field set to the device number of the autofs mount. The
device number can be obtained from the mount options shown in device number can be obtained from the mount options shown in
/proc/mounts. The close call requires an initialized struct /proc/mounts. The close call requires an initialized struct

2
Documentation/filesystems/hfsplus.txt
View File

@ -56,4 +56,4 @@ References
kernel source: <file:fs/hfsplus> kernel source: <file:fs/hfsplus>
Apple Technote 1150 http://developer.apple.com/technotes/tn/tn1150.html Apple Technote 1150 https://developer.apple.com/legacy/library/technotes/tn/tn1150.html

2
Documentation/futex-requeue-pi.txt
View File

@ -67,7 +67,7 @@ pthread_cond_wait_pi(cond, mutex)
lock(cond->__data.__lock); lock(cond->__data.__lock);
} while(...) } while(...)
unlock(cond->__data.__lock); unlock(cond->__data.__lock);
/* the kernel acquired the the mutex for us */ /* the kernel acquired the mutex for us */
} }
pthread_cond_broadcast_pi(cond) pthread_cond_broadcast_pi(cond)

2
Documentation/input/multi-touch-protocol.txt
View File

@ -372,7 +372,7 @@ simple scheme, which is compatible with earlier usage, is:
Rationale: We have no information about the orientation of the touching Rationale: We have no information about the orientation of the touching
ellipse, so approximate it with an inscribed circle instead. The tool ellipse, so approximate it with an inscribed circle instead. The tool
ellipse should align with the the vector (T - C), so the diameter must ellipse should align with the vector (T - C), so the diameter must
increase with distance(T, C). Finally, assume that the touch diameter is increase with distance(T, C). Finally, assume that the touch diameter is
equal to the tool thickness, and we arrive at the formulas above. equal to the tool thickness, and we arrive at the formulas above.

2
Documentation/kmemcheck.txt
View File

@ -541,7 +541,7 @@ initialized. This is the beginning of the struct:
92 } _sifields; 92 } _sifields;
93 } siginfo_t; 93 } siginfo_t;
On 64-bit, the int is 4 bytes long, so it must the the union member that has On 64-bit, the int is 4 bytes long, so it must the union member that has
not been initialized. We can verify this using gdb: not been initialized. We can verify this using gdb:
$ gdb vmlinux $ gdb vmlinux

2
Documentation/memory-barriers.txt
View File

@ -1401,7 +1401,7 @@ code. Here are some examples of these sorts of optimizations:
process_message(msg); process_message(msg);
} }
There is nothing to prevent the the compiler from transforming There is nothing to prevent the compiler from transforming
process_level() to the following, in fact, this might well be a process_level() to the following, in fact, this might well be a
win for single-threaded code: win for single-threaded code:

10
Documentation/module-signing.txt
View File

@ -77,11 +77,11 @@ This has a number of options available:
This presents a choice of which hash algorithm the installation phase will This presents a choice of which hash algorithm the installation phase will
sign the modules with: sign the modules with:
CONFIG_SIG_SHA1 "Sign modules with SHA-1" CONFIG_MODULE_SIG_SHA1 "Sign modules with SHA-1"
CONFIG_SIG_SHA224 "Sign modules with SHA-224" CONFIG_MODULE_SIG_SHA224 "Sign modules with SHA-224"
CONFIG_SIG_SHA256 "Sign modules with SHA-256" CONFIG_MODULE_SIG_SHA256 "Sign modules with SHA-256"
CONFIG_SIG_SHA384 "Sign modules with SHA-384" CONFIG_MODULE_SIG_SHA384 "Sign modules with SHA-384"
CONFIG_SIG_SHA512 "Sign modules with SHA-512" CONFIG_MODULE_SIG_SHA512 "Sign modules with SHA-512"
The algorithm selected here will also be built into the kernel (rather The algorithm selected here will also be built into the kernel (rather
than being a module) so that modules signed with that algorithm can have than being a module) so that modules signed with that algorithm can have

2
Documentation/networking/spider_net.txt
View File

@ -73,7 +73,7 @@ Thus, in an idle system, the GDACTDPA, tail and head pointers will
all be pointing at the same descr, which should be "empty". All of the all be pointing at the same descr, which should be "empty". All of the
other descrs in the ring should be "empty" as well. other descrs in the ring should be "empty" as well.
The show_rx_chain() routine will print out the the locations of the The show_rx_chain() routine will print out the locations of the
GDACTDPA, tail and head pointers. It will also summarize the contents GDACTDPA, tail and head pointers. It will also summarize the contents
of the ring, starting at the tail pointer, and listing the status of the ring, starting at the tail pointer, and listing the status
of the descrs that follow. of the descrs that follow.

2
Documentation/power/devices.txt
View File

@ -391,7 +391,7 @@ When resuming from freeze, standby or memory sleep, the phases are:
the resume methods. This generally involves undoing the actions of the the resume methods. This generally involves undoing the actions of the
preceding suspend_late phase. preceding suspend_late phase.
3 The resume methods should bring the the device back to its operating 3 The resume methods should bring the device back to its operating
state, so that it can perform normal I/O. This generally involves state, so that it can perform normal I/O. This generally involves
undoing the actions of the suspend phase. undoing the actions of the suspend phase.

2
Documentation/security/Smack.txt
View File

@ -3,7 +3,7 @@
"Good for you, you've decided to clean the elevator!" "Good for you, you've decided to clean the elevator!"
- The Elevator, from Dark Star - The Elevator, from Dark Star
Smack is the the Simplified Mandatory Access Control Kernel. Smack is the Simplified Mandatory Access Control Kernel.
Smack is a kernel based implementation of mandatory access Smack is a kernel based implementation of mandatory access
control that includes simplicity in its primary design goals. control that includes simplicity in its primary design goals.

2
Documentation/trace/ring-buffer-design.txt
View File

@ -683,7 +683,7 @@ against nested writers.
cmpxchg(tail_page, temp_page, next_page) cmpxchg(tail_page, temp_page, next_page)
The above will update the tail page if it is still pointing to the expected The above will update the tail page if it is still pointing to the expected
page. If this fails, a nested write pushed it forward, the the current write page. If this fails, a nested write pushed it forward, the current write
does not need to push it. does not need to push it.

2
Documentation/usb/WUSB-Design-overview.txt
View File

@ -25,7 +25,7 @@ updated content.
* Design-overview.txt-1.8 * Design-overview.txt-1.8
This code implements a Ultra Wide Band stack for Linux, as well as This code implements a Ultra Wide Band stack for Linux, as well as
drivers for the the USB based UWB radio controllers defined in the drivers for the USB based UWB radio controllers defined in the
Wireless USB 1.0 specification (including Wireless USB host controller Wireless USB 1.0 specification (including Wireless USB host controller
and an Intel WiNET controller). and an Intel WiNET controller).

2
Documentation/virtual/kvm/api.txt
View File

@ -1491,7 +1491,7 @@ struct kvm_lapic_state {
char regs[KVM_APIC_REG_SIZE]; char regs[KVM_APIC_REG_SIZE];
}; };
Copies the input argument into the the Local APIC registers. The data format Copies the input argument into the Local APIC registers. The data format
and layout are the same as documented in the architecture manual. and layout are the same as documented in the architecture manual.

2
Documentation/vm/unevictable-lru.txt
View File

@ -453,7 +453,7 @@ putback_lru_page() function to add migrated pages back to the LRU.
mmap(MAP_LOCKED) SYSTEM CALL HANDLING mmap(MAP_LOCKED) SYSTEM CALL HANDLING
------------------------------------- -------------------------------------
In addition the the mlock()/mlockall() system calls, an application can request In addition the mlock()/mlockall() system calls, an application can request
that a region of memory be mlocked supplying the MAP_LOCKED flag to the mmap() that a region of memory be mlocked supplying the MAP_LOCKED flag to the mmap()
call. Furthermore, any mmap() call or brk() call that expands the heap by a call. Furthermore, any mmap() call or brk() call that expands the heap by a
task that has previously called mlockall() with the MCL_FUTURE flag will result task that has previously called mlockall() with the MCL_FUTURE flag will result

1
arch/arc/Kconfig
View File

@ -356,7 +356,6 @@ config ARC_CURR_IN_REG
config ARC_MISALIGN_ACCESS config ARC_MISALIGN_ACCESS
bool "Emulate unaligned memory access (userspace only)" bool "Emulate unaligned memory access (userspace only)"
default N
select SYSCTL_ARCH_UNALIGN_NO_WARN select SYSCTL_ARCH_UNALIGN_NO_WARN
select SYSCTL_ARCH_UNALIGN_ALLOW select SYSCTL_ARCH_UNALIGN_ALLOW
help help

2
arch/arm/mach-spear/Kconfig
View File

@ -92,7 +92,7 @@ config MACH_SPEAR600
depends on ARCH_SPEAR6XX depends on ARCH_SPEAR6XX
select USE_OF select USE_OF
help help
Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig" Supports ST SPEAr600 boards configured via the device-tree
config ARCH_SPEAR_AUTO config ARCH_SPEAR_AUTO
def_bool PLAT_SPEAR_SINGLE def_bool PLAT_SPEAR_SINGLE

2
arch/cris/arch-v32/drivers/Kconfig
View File

@ -11,7 +11,6 @@ config ETRAX_ETHERNET
config ETRAX_NO_PHY config ETRAX_NO_PHY
bool "PHY not present" bool "PHY not present"
depends on ETRAX_ETHERNET depends on ETRAX_ETHERNET
default N
help help
This option disables all MDIO communication with an ethernet This option disables all MDIO communication with an ethernet
transceiver connected to the MII interface. This option shall transceiver connected to the MII interface. This option shall
@ -116,7 +115,6 @@ config ETRAX_AXISFLASHMAP
config ETRAX_AXISFLASHMAP_MTD0WHOLE config ETRAX_AXISFLASHMAP_MTD0WHOLE
bool "MTD0 is whole boot flash device" bool "MTD0 is whole boot flash device"
depends on ETRAX_AXISFLASHMAP depends on ETRAX_AXISFLASHMAP
default N
help help
When this option is not set, mtd0 refers to the first partition When this option is not set, mtd0 refers to the first partition
on the boot flash device. When set, mtd0 refers to the whole on the boot flash device. When set, mtd0 refers to the whole

2
arch/s390/include/asm/cio.h
View File

@ -199,7 +199,7 @@ struct esw_eadm {
/** /**
* struct irb - interruption response block * struct irb - interruption response block
* @scsw: subchannel status word * @scsw: subchannel status word
* @esw: extened status word * @esw: extended status word
* @ecw: extended control word * @ecw: extended control word
* *
* The irb that is handed to the device driver when an interrupt occurs. For * The irb that is handed to the device driver when an interrupt occurs. For

2
block/blk-core.c
View File

@ -1928,7 +1928,7 @@ EXPORT_SYMBOL(submit_bio);
* in some cases below, so export this function. * in some cases below, so export this function.
* Request stacking drivers like request-based dm may change the queue * Request stacking drivers like request-based dm may change the queue
* limits while requests are in the queue (e.g. dm's table swapping). * limits while requests are in the queue (e.g. dm's table swapping).
* Such request stacking drivers should check those requests agaist * Such request stacking drivers should check those requests against
* the new queue limits again when they dispatch those requests, * the new queue limits again when they dispatch those requests,
* although such checkings are also done against the old queue limits * although such checkings are also done against the old queue limits
* when submitting requests. * when submitting requests.

2
block/blk-map.c
View File

@ -285,7 +285,7 @@ EXPORT_SYMBOL(blk_rq_unmap_user);
* *
* Description: * Description:
* Data will be mapped directly if possible. Otherwise a bounce * Data will be mapped directly if possible. Otherwise a bounce
* buffer is used. Can be called multple times to append multple * buffer is used. Can be called multiple times to append multiple
* buffers. * buffers.
*/ */
int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,

4
drivers/ata/libata-core.c
View File

@ -1524,7 +1524,7 @@ static void ata_qc_complete_internal(struct ata_queued_cmd *qc)
* @dev: Device to which the command is sent * @dev: Device to which the command is sent
* @tf: Taskfile registers for the command and the result * @tf: Taskfile registers for the command and the result
* @cdb: CDB for packet command * @cdb: CDB for packet command
* @dma_dir: Data tranfer direction of the command * @dma_dir: Data transfer direction of the command
* @sgl: sg list for the data buffer of the command * @sgl: sg list for the data buffer of the command
* @n_elem: Number of sg entries * @n_elem: Number of sg entries
* @timeout: Timeout in msecs (0 for default) * @timeout: Timeout in msecs (0 for default)
@ -1712,7 +1712,7 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
* @dev: Device to which the command is sent * @dev: Device to which the command is sent
* @tf: Taskfile registers for the command and the result * @tf: Taskfile registers for the command and the result
* @cdb: CDB for packet command * @cdb: CDB for packet command
* @dma_dir: Data tranfer direction of the command * @dma_dir: Data transfer direction of the command
* @buf: Data buffer of the command * @buf: Data buffer of the command
* @buflen: Length of data buffer * @buflen: Length of data buffer
* @timeout: Timeout in msecs (0 for default) * @timeout: Timeout in msecs (0 for default)

2
drivers/base/bus.c
View File

@ -1218,7 +1218,7 @@ err_dev:
* with the name of the subsystem. The root device can carry subsystem- * with the name of the subsystem. The root device can carry subsystem-
* wide attributes. All registered devices are below this single root * wide attributes. All registered devices are below this single root
* device and are named after the subsystem with a simple enumeration * device and are named after the subsystem with a simple enumeration
* number appended. The registered devices are not explicitely named; * number appended. The registered devices are not explicitly named;
* only 'id' in the device needs to be set. * only 'id' in the device needs to be set.
* *
* Do not use this interface for anything new, it exists for compatibility * Do not use this interface for anything new, it exists for compatibility

3
drivers/bluetooth/Kconfig
View File

@ -241,5 +241,6 @@ config BT_WILINK
core driver to communicate with the BT core of the combo chip. core driver to communicate with the BT core of the combo chip.
Say Y here to compile support for Texas Instrument's WiLink7 driver Say Y here to compile support for Texas Instrument's WiLink7 driver
into the kernel or say M to compile it as module. into the kernel or say M to compile it as module (btwilink).
endmenu endmenu

2
drivers/gpu/drm/drm_crtc_helper.c
View File

@ -564,7 +564,7 @@ drm_crtc_helper_disable(struct drm_crtc *crtc)
* Caller must hold mode config lock. * Caller must hold mode config lock.
* *
* Setup a new configuration, provided by the upper layers (either an ioctl call * Setup a new configuration, provided by the upper layers (either an ioctl call
* from userspace or internally e.g. from the fbdev suppport code) in @set, and * from userspace or internally e.g. from the fbdev support code) in @set, and
* enable it. This is the main helper functions for drivers that implement * enable it. This is the main helper functions for drivers that implement
* kernel mode setting with the crtc helper functions and the assorted * kernel mode setting with the crtc helper functions and the assorted
* ->prepare(), ->modeset() and ->commit() helper callbacks. * ->prepare(), ->modeset() and ->commit() helper callbacks.

2
drivers/input/sparse-keymap.c
View File

@ -236,7 +236,7 @@ EXPORT_SYMBOL(sparse_keymap_setup);
* in an input device that was set up by sparse_keymap_setup(). * in an input device that was set up by sparse_keymap_setup().
* NOTE: It is safe to cal this function while input device is * NOTE: It is safe to cal this function while input device is
* still registered (however the drivers should care not to try to * still registered (however the drivers should care not to try to
* use freed keymap and thus have to shut off interrups/polling * use freed keymap and thus have to shut off interrupts/polling
* before freeing the keymap). * before freeing the keymap).
*/ */
void sparse_keymap_free(struct input_dev *dev) void sparse_keymap_free(struct input_dev *dev)

2
drivers/misc/mic/Kconfig
View File

@ -4,7 +4,6 @@ config INTEL_MIC_HOST
tristate "Intel MIC Host Driver" tristate "Intel MIC Host Driver"
depends on 64BIT && PCI && X86 depends on 64BIT && PCI && X86
select VHOST_RING select VHOST_RING
default N
help help
This enables Host Driver support for the Intel Many Integrated This enables Host Driver support for the Intel Many Integrated
Core (MIC) family of PCIe form factor coprocessor devices that Core (MIC) family of PCIe form factor coprocessor devices that
@ -25,7 +24,6 @@ config INTEL_MIC_CARD
tristate "Intel MIC Card Driver" tristate "Intel MIC Card Driver"
depends on 64BIT && X86 depends on 64BIT && X86
select VIRTIO select VIRTIO
default N
help help
This enables card driver support for the Intel Many Integrated This enables card driver support for the Intel Many Integrated
Core (MIC) device family. The card driver communicates shutdown/ Core (MIC) device family. The card driver communicates shutdown/

2
drivers/mmc/core/host.c
View File

@ -337,7 +337,7 @@ int mmc_of_parse(struct mmc_host *host)
break; break;
default: default:
dev_err(host->parent, dev_err(host->parent,
"Invalid \"bus-width\" value %ud!\n", bus_width); "Invalid \"bus-width\" value %u!\n", bus_width);
return -EINVAL; return -EINVAL;
} }

2
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
View File

@ -585,7 +585,7 @@ static int ixgbe_fcoe_dma_pool_alloc(struct ixgbe_fcoe *fcoe,
struct dma_pool *pool; struct dma_pool *pool;
char pool_name[32]; char pool_name[32];
snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%d", cpu); snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%u", cpu);
pool = dma_pool_create(pool_name, dev, IXGBE_FCPTR_MAX, pool = dma_pool_create(pool_name, dev, IXGBE_FCPTR_MAX,
IXGBE_FCPTR_ALIGN, PAGE_SIZE); IXGBE_FCPTR_ALIGN, PAGE_SIZE);

2
drivers/regulator/core.c
View File

@ -2138,7 +2138,7 @@ EXPORT_SYMBOL_GPL(regulator_is_enabled);
* @regulator: regulator source * @regulator: regulator source
* *
* Returns positive if the regulator driver backing the source/client * Returns positive if the regulator driver backing the source/client
* can change its voltage, false otherwise. Usefull for detecting fixed * can change its voltage, false otherwise. Useful for detecting fixed
* or dummy regulators and disabling voltage change logic in the client * or dummy regulators and disabling voltage change logic in the client
* driver. * driver.
*/ */

6
drivers/scsi/scsi_transport_iscsi.c
View File

@ -1225,7 +1225,7 @@ struct bus_type iscsi_flashnode_bus = {
* Adds a sysfs entry for the flashnode session attributes * Adds a sysfs entry for the flashnode session attributes
* *
* Returns: * Returns:
* pointer to allocated flashnode sess on sucess * pointer to allocated flashnode sess on success
* %NULL on failure * %NULL on failure
*/ */
struct iscsi_bus_flash_session * struct iscsi_bus_flash_session *
@ -1423,7 +1423,7 @@ static int iscsi_iter_destroy_flashnode_conn_fn(struct device *dev, void *data)
} }
/** /**
* iscsi_destroy_flashnode_sess - destory flashnode session entry * iscsi_destroy_flashnode_sess - destroy flashnode session entry
* @fnode_sess: pointer to flashnode session entry to be destroyed * @fnode_sess: pointer to flashnode session entry to be destroyed
* *
* Deletes the flashnode session entry and all children flashnode connection * Deletes the flashnode session entry and all children flashnode connection
@ -1453,7 +1453,7 @@ static int iscsi_iter_destroy_flashnode_fn(struct device *dev, void *data)
} }
/** /**
* iscsi_destroy_all_flashnode - destory all flashnode session entries * iscsi_destroy_all_flashnode - destroy all flashnode session entries
* @shost: pointer to host data * @shost: pointer to host data
* *
* Destroys all the flashnode session entries and all corresponding children * Destroys all the flashnode session entries and all corresponding children

2
drivers/staging/android/Kconfig
View File

@ -2,7 +2,6 @@ menu "Android"
config ANDROID config ANDROID
bool "Android Drivers" bool "Android Drivers"
default N
---help--- ---help---
Enable support for various drivers needed on the Android platform Enable support for various drivers needed on the Android platform
@ -73,7 +72,6 @@ config ANDROID_TIMED_GPIO
config ANDROID_LOW_MEMORY_KILLER config ANDROID_LOW_MEMORY_KILLER
bool "Android Low Memory Killer" bool "Android Low Memory Killer"
default N
---help--- ---help---
Registers processes to be killed when memory is low Registers processes to be killed when memory is low

1
drivers/staging/bcm/Kconfig
View File

@ -1,7 +1,6 @@
config BCM_WIMAX config BCM_WIMAX
tristate "Beceem BCS200/BCS220-3 and BCSM250 wimax support" tristate "Beceem BCS200/BCS220-3 and BCSM250 wimax support"
depends on USB && NET depends on USB && NET
default N
help help
This is an experimental driver for the Beceem WIMAX chipset used This is an experimental driver for the Beceem WIMAX chipset used
by Sprint 4G. by Sprint 4G.

1
drivers/staging/frontier/Kconfig
View File

@ -1,6 +1,5 @@
config TRANZPORT config TRANZPORT
tristate "Frontier Tranzport and Alphatrack support" tristate "Frontier Tranzport and Alphatrack support"
depends on USB depends on USB
default N
---help--- ---help---
Enable support for the Frontier Tranzport and Alphatrack devices. Enable support for the Frontier Tranzport and Alphatrack devices.

3
drivers/staging/media/go7007/Kconfig
View File

@ -13,7 +13,6 @@ config VIDEO_GO7007
select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT
select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT
select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT
default N
---help--- ---help---
This is a video4linux driver for the WIS GO7007 MPEG This is a video4linux driver for the WIS GO7007 MPEG
encoder chip. encoder chip.
@ -24,7 +23,6 @@ config VIDEO_GO7007
config VIDEO_GO7007_USB config VIDEO_GO7007_USB
tristate "WIS GO7007 USB support" tristate "WIS GO7007 USB support"
depends on VIDEO_GO7007 && USB depends on VIDEO_GO7007 && USB
default N
---help--- ---help---
This is a video4linux driver for the WIS GO7007 MPEG This is a video4linux driver for the WIS GO7007 MPEG
encoder chip over USB. encoder chip over USB.
@ -46,7 +44,6 @@ config VIDEO_GO7007_LOADER
config VIDEO_GO7007_USB_S2250_BOARD config VIDEO_GO7007_USB_S2250_BOARD
tristate "Sensoray 2250/2251 support" tristate "Sensoray 2250/2251 support"
depends on VIDEO_GO7007_USB && USB depends on VIDEO_GO7007_USB && USB
default N
---help--- ---help---
This is a video4linux driver for the Sensoray 2250/2251 device. This is a video4linux driver for the Sensoray 2250/2251 device.

1
drivers/staging/rtl8187se/Kconfig
View File

@ -6,6 +6,5 @@ config R8187SE
select WEXT_PRIV select WEXT_PRIV
select EEPROM_93CX6 select EEPROM_93CX6
select CRYPTO select CRYPTO
default N
---help--- ---help---
If built as a module, it will be called r8187se.ko. If built as a module, it will be called r8187se.ko.

1
drivers/staging/rtl8188eu/Kconfig
View File

@ -3,7 +3,6 @@ config R8188EU
depends on WLAN && USB depends on WLAN && USB
select WIRELESS_EXT select WIRELESS_EXT
select WEXT_PRIV select WEXT_PRIV
default N
---help--- ---help---
This option adds the Realtek RTL8188EU USB device such as TP-Link TL-WN725N. This option adds the Realtek RTL8188EU USB device such as TP-Link TL-WN725N.
If built as a module, it will be called r8188eu. If built as a module, it will be called r8188eu.

1
drivers/staging/rtl8192e/rtl8192e/Kconfig
View File

@ -5,5 +5,4 @@ config RTL8192E
select WIRELESS_EXT select WIRELESS_EXT
select WEXT_PRIV select WEXT_PRIV
select CRYPTO select CRYPTO
default N
---help--- ---help---

1
drivers/staging/rtl8192u/Kconfig
View File

@ -5,5 +5,4 @@ config RTL8192U
select WIRELESS_EXT select WIRELESS_EXT
select WEXT_PRIV select WEXT_PRIV
select CRYPTO select CRYPTO
default N
---help--- ---help---

2
drivers/staging/rtl8712/Kconfig
View File

@ -4,7 +4,6 @@ config R8712U
select WIRELESS_EXT select WIRELESS_EXT
select WEXT_PRIV select WEXT_PRIV
select FW_LOADER select FW_LOADER
default N
---help--- ---help---
This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130. This option adds the Realtek RTL8712 USB device such as the D-Link DWA-130.
If built as a module, it will be called r8712u. If built as a module, it will be called r8712u.
@ -12,7 +11,6 @@ config R8712U
config R8712_TX_AGGR config R8712_TX_AGGR
bool "Realtek RTL8712U Transmit Aggregation code" bool "Realtek RTL8712U Transmit Aggregation code"
depends on R8712U && BROKEN depends on R8712U && BROKEN
default N
---help--- ---help---
This option provides transmit aggregation for the Realtek RTL8712 USB device. This option provides transmit aggregation for the Realtek RTL8712 USB device.

4
drivers/staging/usbip/Kconfig
View File

@ -1,7 +1,6 @@
config USBIP_CORE config USBIP_CORE
tristate "USB/IP support" tristate "USB/IP support"
depends on USB && NET depends on USB && NET
default N
---help--- ---help---
This enables pushing USB packets over IP to allow remote This enables pushing USB packets over IP to allow remote
machines direct access to USB devices. It provides the machines direct access to USB devices. It provides the
@ -18,7 +17,6 @@ config USBIP_CORE
config USBIP_VHCI_HCD config USBIP_VHCI_HCD
tristate "VHCI hcd" tristate "VHCI hcd"
depends on USBIP_CORE depends on USBIP_CORE
default N
---help--- ---help---
This enables the USB/IP virtual host controller driver, This enables the USB/IP virtual host controller driver,
which is run on the remote machine. which is run on the remote machine.
@ -29,7 +27,6 @@ config USBIP_VHCI_HCD
config USBIP_HOST config USBIP_HOST
tristate "Host driver" tristate "Host driver"
depends on USBIP_CORE depends on USBIP_CORE
default N
---help--- ---help---
This enables the USB/IP host driver, which is run on the This enables the USB/IP host driver, which is run on the
machine that is sharing the USB devices. machine that is sharing the USB devices.
@ -40,6 +37,5 @@ config USBIP_HOST
config USBIP_DEBUG config USBIP_DEBUG
bool "Debug messages for USB/IP" bool "Debug messages for USB/IP"
depends on USBIP_CORE depends on USBIP_CORE
default N
---help--- ---help---
This enables the debug messages from the USB/IP drivers. This enables the debug messages from the USB/IP drivers.

1
drivers/usb/core/Kconfig
View File

@ -10,7 +10,6 @@ config USB_DEBUG
config USB_ANNOUNCE_NEW_DEVICES config USB_ANNOUNCE_NEW_DEVICES
bool "USB announce new devices" bool "USB announce new devices"
default N
help help
Say Y here if you want the USB core to always announce the Say Y here if you want the USB core to always announce the
idVendor, idProduct, Manufacturer, Product, and SerialNumber idVendor, idProduct, Manufacturer, Product, and SerialNumber

2
drivers/usb/core/message.c
View File

@ -178,7 +178,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
* *
* Return: * Return:
* If successful, 0. Otherwise a negative error number. The number of actual * If successful, 0. Otherwise a negative error number. The number of actual
* bytes transferred will be stored in the @actual_length paramater. * bytes transferred will be stored in the @actual_length parameter.
*/ */
int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe, int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
void *data, int len, int *actual_length, int timeout) void *data, int len, int *actual_length, int timeout)

2
drivers/usb/core/urb.c
View File

@ -831,7 +831,7 @@ EXPORT_SYMBOL_GPL(usb_unpoison_anchored_urbs);
* *
* this allows all outstanding URBs to be unlinked starting * this allows all outstanding URBs to be unlinked starting
* from the back of the queue. This function is asynchronous. * from the back of the queue. This function is asynchronous.
* The unlinking is just tiggered. It may happen after this * The unlinking is just triggered. It may happen after this
* function has returned. * function has returned.
* *
* This routine should not be called by a driver after its disconnect * This routine should not be called by a driver after its disconnect

3
drivers/usb/host/Kconfig
View File

@ -314,7 +314,6 @@ config USB_ISP1760_HCD
config USB_ISP1362_HCD config USB_ISP1362_HCD
tristate "ISP1362 HCD support" tristate "ISP1362 HCD support"
default N
---help--- ---help---
Supports the Philips ISP1362 chip as a host controller Supports the Philips ISP1362 chip as a host controller
@ -326,7 +325,6 @@ config USB_ISP1362_HCD
config USB_FUSBH200_HCD config USB_FUSBH200_HCD
tristate "FUSBH200 HCD support" tristate "FUSBH200 HCD support"
depends on USB depends on USB
default N
---help--- ---help---
Faraday FUSBH200 is designed to meet USB2.0 EHCI specification Faraday FUSBH200 is designed to meet USB2.0 EHCI specification
with minor modification. with minor modification.
@ -337,7 +335,6 @@ config USB_FUSBH200_HCD
config USB_FOTG210_HCD config USB_FOTG210_HCD
tristate "FOTG210 HCD support" tristate "FOTG210 HCD support"
depends on USB depends on USB
default N
---help--- ---help---
Faraday FOTG210 is an OTG controller which can be configured as Faraday FOTG210 is an OTG controller which can be configured as
an USB2.0 host. It is designed to meet USB2.0 EHCI specification an USB2.0 host. It is designed to meet USB2.0 EHCI specification

2
fs/buffer.c
View File

@ -3088,7 +3088,7 @@ EXPORT_SYMBOL(submit_bh);
* until the buffer gets unlocked). * until the buffer gets unlocked).
* *
* ll_rw_block sets b_end_io to simple completion handler that marks * ll_rw_block sets b_end_io to simple completion handler that marks
* the buffer up-to-date (if approriate), unlocks the buffer and wakes * the buffer up-to-date (if appropriate), unlocks the buffer and wakes
* any waiters. * any waiters.
* *
* All of the buffers must be for the same device, and must also be a * All of the buffers must be for the same device, and must also be a

6
fs/debugfs/inode.c
View File

@ -358,7 +358,7 @@ exit:
* @name: a pointer to a string containing the name of the file to create. * @name: a pointer to a string containing the name of the file to create.
* @mode: the permission that the file should have. * @mode: the permission that the file should have.
* @parent: a pointer to the parent dentry for this file. This should be a * @parent: a pointer to the parent dentry for this file. This should be a
* directory dentry if set. If this paramater is NULL, then the * directory dentry if set. If this parameter is NULL, then the
* file will be created in the root of the debugfs filesystem. * file will be created in the root of the debugfs filesystem.
* @data: a pointer to something that the caller will want to get to later * @data: a pointer to something that the caller will want to get to later
* on. The inode.i_private pointer will point to this value on * on. The inode.i_private pointer will point to this value on
@ -400,7 +400,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
* @name: a pointer to a string containing the name of the directory to * @name: a pointer to a string containing the name of the directory to
* create. * create.
* @parent: a pointer to the parent dentry for this file. This should be a * @parent: a pointer to the parent dentry for this file. This should be a
* directory dentry if set. If this paramater is NULL, then the * directory dentry if set. If this parameter is NULL, then the
* directory will be created in the root of the debugfs filesystem. * directory will be created in the root of the debugfs filesystem.
* *
* This function creates a directory in debugfs with the given name. * This function creates a directory in debugfs with the given name.
@ -425,7 +425,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);
* @name: a pointer to a string containing the name of the symbolic link to * @name: a pointer to a string containing the name of the symbolic link to
* create. * create.
* @parent: a pointer to the parent dentry for this symbolic link. This * @parent: a pointer to the parent dentry for this symbolic link. This
* should be a directory dentry if set. If this paramater is NULL, * should be a directory dentry if set. If this parameter is NULL,
* then the symbolic link will be created in the root of the debugfs * then the symbolic link will be created in the root of the debugfs
* filesystem. * filesystem.
* @target: a pointer to a string containing the path to the target of the * @target: a pointer to a string containing the path to the target of the

2
include/drm/drm_fb_helper.h
View File

@ -55,7 +55,7 @@ struct drm_fb_helper_surface_size {
* save the current lut when force-restoring the fbdev for e.g. * save the current lut when force-restoring the fbdev for e.g.
* kdbg. * kdbg.
* @fb_probe: Driver callback to allocate and initialize the fbdev info * @fb_probe: Driver callback to allocate and initialize the fbdev info
* structure. Futhermore it also needs to allocate the drm * structure. Furthermore it also needs to allocate the drm
* framebuffer used to back the fbdev. * framebuffer used to back the fbdev.
* @initial_config: Setup an initial fbdev display configuration * @initial_config: Setup an initial fbdev display configuration
* *

2
include/linux/gpio.h
View File

@ -3,7 +3,7 @@
#include <linux/errno.h> #include <linux/errno.h>
/* see Documentation/gpio.txt */ /* see Documentation/gpio/gpio-legacy.txt */
/* make these flag values available regardless of GPIO kconfig options */ /* make these flag values available regardless of GPIO kconfig options */
#define GPIOF_DIR_OUT (0 << 0) #define GPIOF_DIR_OUT (0 << 0)

2
include/linux/hsi/hsi.h
View File

@ -178,7 +178,7 @@ static inline void hsi_unregister_client_driver(struct hsi_client_driver *drv)
* @complete: Transfer completion callback * @complete: Transfer completion callback
* @destructor: Destructor to free resources when flushing * @destructor: Destructor to free resources when flushing
* @status: Status of the transfer when completed * @status: Status of the transfer when completed
* @actual_len: Actual length of data transfered on completion * @actual_len: Actual length of data transferred on completion
* @channel: Channel were to TX/RX the message * @channel: Channel were to TX/RX the message
* @ttype: Transfer type (TX if set, RX otherwise) * @ttype: Transfer type (TX if set, RX otherwise)
* @break_frame: if true HSI will send/receive a break frame. Data buffers are * @break_frame: if true HSI will send/receive a break frame. Data buffers are

1
include/linux/idr.h
View File

@ -82,7 +82,6 @@ int idr_for_each(struct idr *idp,
void *idr_get_next(struct idr *idp, int *nextid); void *idr_get_next(struct idr *idp, int *nextid);
void *idr_replace(struct idr *idp, void *ptr, int id); void *idr_replace(struct idr *idp, void *ptr, int id);
void idr_remove(struct idr *idp, int id); void idr_remove(struct idr *idp, int id);
void idr_free(struct idr *idp, int id);
void idr_destroy(struct idr *idp); void idr_destroy(struct idr *idp);
void idr_init(struct idr *idp); void idr_init(struct idr *idp);
bool idr_is_empty(struct idr *idp); bool idr_is_empty(struct idr *idp);

2
include/linux/kfifo.h
View File

@ -722,7 +722,7 @@ __kfifo_uint_must_check_helper( \
/** /**
* kfifo_dma_out_finish - finish a DMA OUT operation * kfifo_dma_out_finish - finish a DMA OUT operation
* @fifo: address of the fifo to be used * @fifo: address of the fifo to be used
* @len: number of bytes transferd * @len: number of bytes transferrd
* *
* This macro finish a DMA OUT operation. The out counter will be updated by * This macro finish a DMA OUT operation. The out counter will be updated by
* the len parameter. No error checking will be done. * the len parameter. No error checking will be done.

2
include/linux/pipe_fs_i.h
View File

@ -35,7 +35,7 @@ struct pipe_buffer {
* @tmp_page: cached released page * @tmp_page: cached released page
* @readers: number of current readers of this pipe * @readers: number of current readers of this pipe
* @writers: number of current writers of this pipe * @writers: number of current writers of this pipe
* @files: number of struct file refering this pipe (protected by ->i_lock) * @files: number of struct file referring this pipe (protected by ->i_lock)
* @waiting_writers: number of writers blocked waiting for room * @waiting_writers: number of writers blocked waiting for room
* @r_counter: reader counter * @r_counter: reader counter
* @w_counter: writer counter * @w_counter: writer counter

9
include/linux/platform_data/ata-samsung_cf.h
View File

@ -1,5 +1,4 @@
/* linux/arch/arm/plat-samsung/include/plat/ata.h /*
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd. * Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com * http://www.samsung.com
* *
@ -10,8 +9,8 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __ASM_PLAT_ATA_H #ifndef __ATA_SAMSUNG_CF_H
#define __ASM_PLAT_ATA_H __FILE__ #define __ATA_SAMSUNG_CF_H __FILE__
/** /**
* struct s3c_ide_platdata - S3C IDE driver platform data. * struct s3c_ide_platdata - S3C IDE driver platform data.
@ -33,4 +32,4 @@ extern void s3c64xx_ide_setup_gpio(void);
extern void s5pc100_ide_setup_gpio(void); extern void s5pc100_ide_setup_gpio(void);
extern void s5pv210_ide_setup_gpio(void); extern void s5pv210_ide_setup_gpio(void);
#endif /*__ASM_PLAT_ATA_H */ #endif /*__ATA_SAMSUNG_CF_H */

2
include/linux/skbuff.h
View File

@ -2038,7 +2038,7 @@ static inline void skb_propagate_pfmemalloc(struct page *page,
} }
/** /**
* skb_frag_page - retrieve the page refered to by a paged fragment * skb_frag_page - retrieve the page referred to by a paged fragment
* @frag: the paged fragment * @frag: the paged fragment
* *
* Returns the &struct page associated with @frag. * Returns the &struct page associated with @frag.

8
include/linux/spi/spi.h
View File

@ -237,7 +237,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
* @mode_bits: flags understood by this controller driver * @mode_bits: flags understood by this controller driver
* @bits_per_word_mask: A mask indicating which values of bits_per_word are * @bits_per_word_mask: A mask indicating which values of bits_per_word are
* supported by the driver. Bit n indicates that a bits_per_word n+1 is * supported by the driver. Bit n indicates that a bits_per_word n+1 is
* suported. If set, the SPI core will reject any transfer with an * supported. If set, the SPI core will reject any transfer with an
* unsupported bits_per_word. If not set, this value is simply ignored, * unsupported bits_per_word. If not set, this value is simply ignored,
* and it's up to the individual driver to perform any validation. * and it's up to the individual driver to perform any validation.
* @min_speed_hz: Lowest supported transfer speed * @min_speed_hz: Lowest supported transfer speed
@ -262,7 +262,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
* @cur_msg: the currently in-flight message * @cur_msg: the currently in-flight message
* @cur_msg_prepared: spi_prepare_message was called for the currently * @cur_msg_prepared: spi_prepare_message was called for the currently
* in-flight message * in-flight message
* @xfer_completion: used by core tranfer_one_message() * @xfer_completion: used by core transfer_one_message()
* @busy: message pump is busy * @busy: message pump is busy
* @running: message pump is running * @running: message pump is running
* @rt: whether this queue is set to run as a realtime task * @rt: whether this queue is set to run as a realtime task
@ -525,7 +525,7 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
* @rx_buf: data to be read (dma-safe memory), or NULL * @rx_buf: data to be read (dma-safe memory), or NULL
* @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped
* @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped
* @tx_nbits: number of bits used for writting. If 0 the default * @tx_nbits: number of bits used for writing. If 0 the default
* (SPI_NBITS_SINGLE) is used. * (SPI_NBITS_SINGLE) is used.
* @rx_nbits: number of bits used for reading. If 0 the default * @rx_nbits: number of bits used for reading. If 0 the default
* (SPI_NBITS_SINGLE) is used. * (SPI_NBITS_SINGLE) is used.
@ -585,7 +585,7 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
* by the results of previous messages and where the whole transaction * by the results of previous messages and where the whole transaction
* ends when the chipselect goes intactive. * ends when the chipselect goes intactive.
* *
* When SPI can transfer in 1x,2x or 4x. It can get this tranfer information * When SPI can transfer in 1x,2x or 4x. It can get this transfer information
* from device through @tx_nbits and @rx_nbits. In Bi-direction, these * from device through @tx_nbits and @rx_nbits. In Bi-direction, these
* two should both be set. User can set transfer mode with SPI_NBITS_SINGLE(1x) * two should both be set. User can set transfer mode with SPI_NBITS_SINGLE(1x)
* SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer. * SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer.

2
include/linux/usb/composite.h
View File

@ -92,7 +92,7 @@ struct usb_configuration;
* @suspend: Notifies functions when the host stops sending USB traffic. * @suspend: Notifies functions when the host stops sending USB traffic.
* @resume: Notifies functions when the host restarts USB traffic. * @resume: Notifies functions when the host restarts USB traffic.
* @get_status: Returns function status as a reply to * @get_status: Returns function status as a reply to
* GetStatus() request when the recepient is Interface. * GetStatus() request when the recipient is Interface.
* @func_suspend: callback to be called when * @func_suspend: callback to be called when
* SetFeature(FUNCTION_SUSPEND) is reseived * SetFeature(FUNCTION_SUSPEND) is reseived
* *

6
include/net/mac80211.h
View File

@ -1895,7 +1895,7 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
* *
* Driver informs U-APSD client support by enabling * Driver informs U-APSD client support by enabling
* %IEEE80211_HW_SUPPORTS_UAPSD flag. The mode is configured through the * %IEEE80211_HW_SUPPORTS_UAPSD flag. The mode is configured through the
* uapsd paramater in conf_tx() operation. Hardware needs to send the QoS * uapsd parameter in conf_tx() operation. Hardware needs to send the QoS
* Nullfunc frames and stay awake until the service period has ended. To * Nullfunc frames and stay awake until the service period has ended. To
* utilize U-APSD, dynamic powersave is disabled for voip AC and all frames * utilize U-APSD, dynamic powersave is disabled for voip AC and all frames
* from that AC are transmitted with powersave enabled. * from that AC are transmitted with powersave enabled.
@ -2101,7 +2101,7 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
* with the number of frames to be released and which TIDs they are * with the number of frames to be released and which TIDs they are
* to come from. In this case, the driver is responsible for setting * to come from. In this case, the driver is responsible for setting
* the EOSP (for uAPSD) and MORE_DATA bits in the released frames, * the EOSP (for uAPSD) and MORE_DATA bits in the released frames,
* to help the @more_data paramter is passed to tell the driver if * to help the @more_data parameter is passed to tell the driver if
* there is more data on other TIDs -- the TIDs to release frames * there is more data on other TIDs -- the TIDs to release frames
* from are ignored since mac80211 doesn't know how many frames the * from are ignored since mac80211 doesn't know how many frames the
* buffers for those TIDs contain. * buffers for those TIDs contain.
@ -2662,7 +2662,7 @@ enum ieee80211_roc_type {
* parameters. In the case where the driver buffers some frames for * parameters. In the case where the driver buffers some frames for
* sleeping stations mac80211 will use this callback to tell the driver * sleeping stations mac80211 will use this callback to tell the driver
* to release some frames, either for PS-poll or uAPSD. * to release some frames, either for PS-poll or uAPSD.
* Note that if the @more_data paramter is %false the driver must check * Note that if the @more_data parameter is %false the driver must check
* if there are more frames on the given TIDs, and if there are more than * if there are more frames on the given TIDs, and if there are more than
* the frames being released then it must still set the more-data bit in * the frames being released then it must still set the more-data bit in
* the frame. If the @more_data parameter is %true, then of course the * the frame. If the @more_data parameter is %true, then of course the

2
include/uapi/linux/capi.h
View File

@ -102,7 +102,7 @@ typedef struct capi_manufacturer_cmd {
/* /*
* member contr is input for * member contr is input for
* CAPI_GET_MANUFACTURER, CAPI_VERSION, CAPI_GET_SERIAL * CAPI_GET_MANUFACTURER, CAPI_GET_VERSION, CAPI_GET_SERIAL
* and CAPI_GET_PROFILE * and CAPI_GET_PROFILE
*/ */
typedef union capi_ioctl_struct { typedef union capi_ioctl_struct {

2
kernel/relay.c
View File

@ -227,7 +227,7 @@ static void relay_destroy_buf(struct rchan_buf *buf)
* relay_remove_buf - remove a channel buffer * relay_remove_buf - remove a channel buffer
* @kref: target kernel reference that contains the relay buffer * @kref: target kernel reference that contains the relay buffer
* *
* Removes the file from the fileystem, which also frees the * Removes the file from the filesystem, which also frees the
* rchan_buf_struct and the channel buffer. Should only be called from * rchan_buf_struct and the channel buffer. Should only be called from
* kref_put(). * kref_put().
*/ */

2
kernel/signal.c
View File

@ -2382,7 +2382,7 @@ relock:
* @regs: user register state * @regs: user register state
* @stepping: nonzero if debugger single-step or block-step in use * @stepping: nonzero if debugger single-step or block-step in use
* *
* This function should be called when a signal has succesfully been * This function should be called when a signal has successfully been
* delivered. It updates the blocked signals accordingly (@ka->sa.sa_mask * delivered. It updates the blocked signals accordingly (@ka->sa.sa_mask
* is always blocked, and the signal itself is blocked unless %SA_NODEFER * is always blocked, and the signal itself is blocked unless %SA_NODEFER
* is set in @ka->sa.sa_flags. Tracing is notified. * is set in @ka->sa.sa_flags. Tracing is notified.

2
mm/sparse.c
View File

@ -268,7 +268,7 @@ sparse_early_usemaps_alloc_pgdat_section(struct pglist_data *pgdat,
/* /*
* A page may contain usemaps for other sections preventing the * A page may contain usemaps for other sections preventing the
* page being freed and making a section unremovable while * page being freed and making a section unremovable while
* other sections referencing the usemap retmain active. Similarly, * other sections referencing the usemap remain active. Similarly,
* a pgdat can prevent a section being removed. If section A * a pgdat can prevent a section being removed. If section A
* contains a pgdat and section B contains the usemap, both * contains a pgdat and section B contains the usemap, both
* sections become inter-dependent. This allocates usemaps * sections become inter-dependent. This allocates usemaps

2
net/core/dev.c
View File

@ -3446,7 +3446,7 @@ out:
* @rx_handler: receive handler to register * @rx_handler: receive handler to register
* @rx_handler_data: data pointer that is used by rx handler * @rx_handler_data: data pointer that is used by rx handler
* *
* Register a receive hander for a device. This handler will then be * Register a receive handler for a device. This handler will then be
* called from __netif_receive_skb. A negative errno code is returned * called from __netif_receive_skb. A negative errno code is returned
* on a failure. * on a failure.
* *

2
net/core/net-sysfs.c
View File

@ -789,7 +789,7 @@ exit:
kobject_put(kobj); kobject_put(kobj);
return error; return error;
} }
#endif /* CONFIG_SYFS */ #endif /* CONFIG_SYSFS */
int int
net_rx_queue_update_kobjects(struct net_device *net, int old_num, int new_num) net_rx_queue_update_kobjects(struct net_device *net, int old_num, int new_num)