Commit a99cbf6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kernel-doc' from Randy Dunlap 

The usual kernel-doc fixups from Randy.  Some of them David acked as
merged in his tree, this is the random left-overs.

* kernel-doc:
  docbook: fix sched source file names in device-drivers book
  docbook: change iomap source filename in deviceiobook
  docbook: don't use serial_core.h in device-drivers book
  kernel-doc: fix kernel-doc warnings in sched
  kernel-doc: fix new warnings in cfg80211.h
  kernel-doc: fix new warning in usb.h
  kernel-doc: fix new warnings in device.h
  kernel-doc: fix new warnings in debugfs
  kernel-doc: fix new warning in regulator core
  kernel-doc: fix new warnings in pci
  kernel-doc: fix new warnings in driver-core
  kernel-doc: fix new warnings in auditsc.c
  scripts/kernel-doc: fix fatal error caused by cfg80211.h
parents 4f57d865 b4d20859

Documentation/DocBook/device-drivers.tmpl

+3 −2
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ 


     <sect1><title>Delaying, scheduling, and timer routines</title>

!Iinclude/linux/sched.h

!Ekernel/sched.c

!Ekernel/sched/core.c

!Ikernel/sched/cpupri.c

!Ikernel/sched/fair.c

!Iinclude/linux/completion.h

!Ekernel/timer.c

     </sect1>
@@ -216,7 +218,6 @@ X!Isound/sound_firmware.c 


  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

  </chapter>

Documentation/DocBook/deviceiobook.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ CPU B: spin_unlock_irqrestore(&amp;dev_lock, flags) 
  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Iarch/x86/include/asm/io.h

!Elib/iomap.c

!Elib/pci_iomap.c

  </chapter>



</book>

drivers/base/bus.c

+5 −4
Original line number Diff line number Diff line
@@ -915,9 +915,10 @@ static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store); 


/**

 * __bus_register - register a driver-core subsystem

 * @bus: bus.

 * @bus: bus to register

 * @key: lockdep class key

 *

 * Once we have that, we registered the bus with the kobject

 * Once we have that, we register the bus with the kobject

 * infrastructure, then register the children subsystems it has:

 * the devices and drivers that belong to the subsystem.

 */
@@ -1220,8 +1221,8 @@ static void system_root_device_release(struct device *dev) 
}

/**

 * subsys_system_register - register a subsystem at /sys/devices/system/

 * @subsys - system subsystem

 * @groups - default attributes for the root device

 * @subsys: system subsystem

 * @groups: default attributes for the root device

 *

 * All 'system' subsystems have a /sys/devices/system/<name> root device

 * with the name of the subsystem. The root device can carry subsystem-

drivers/pci/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -2802,7 +2802,7 @@ pci_intx(struct pci_dev *pdev, int enable) 


/**

 * pci_intx_mask_supported - probe for INTx masking support

 * @pdev: the PCI device to operate on

 * @dev: the PCI device to operate on

 *

 * Check if the device dev support INTx masking via the config space

 * command word.
@@ -2884,7 +2884,7 @@ done: 


/**

 * pci_check_and_mask_intx - mask INTx on pending interrupt

 * @pdev: the PCI device to operate on

 * @dev: the PCI device to operate on

 *

 * Check if the device dev has its INTx line asserted, mask it and

 * return true in that case. False is returned if not interrupt was
@@ -2898,7 +2898,7 @@ EXPORT_SYMBOL_GPL(pci_check_and_mask_intx); 


/**

 * pci_check_and_mask_intx - unmask INTx of no interrupt is pending

 * @pdev: the PCI device to operate on

 * @dev: the PCI device to operate on

 *

 * Check if the device dev has its INTx line asserted, unmask it if not

 * and return true. False is returned and the mask remains active if

drivers/regulator/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2731,6 +2731,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) 
 * @dev: struct device for the regulator

 * @init_data: platform provided init data, passed through by driver

 * @driver_data: private regulator data

 * @of_node: target open firmware device structure (may be NULL)

 *

 * Called by regulator drivers to register a regulator.

 * Returns 0 on success.

CRA Git | Maintained and supported by SUSTech CRA and CCSE