The patch titled rapidio: fix kernel-doc problems has been added to the -mm tree. Its filename is rapidio-fix-kernel-doc-problems.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: rapidio: fix kernel-doc problems From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> RapidIO kernel-doc: fix multiple kernel-doc warnings and correct some doc typos. Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Cc: Matt Porter <mporter@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/sysdev/fsl_rio.c | 13 +++++++++++-- drivers/rapidio/rio.c | 10 +++++----- include/linux/rio.h | 5 +++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff -puN arch/powerpc/sysdev/fsl_rio.c~rapidio-fix-kernel-doc-problems arch/powerpc/sysdev/fsl_rio.c --- a/arch/powerpc/sysdev/fsl_rio.c~rapidio-fix-kernel-doc-problems +++ a/arch/powerpc/sysdev/fsl_rio.c @@ -198,6 +198,7 @@ struct rio_priv { /** * fsl_rio_doorbell_send - Send a MPC85xx doorbell message + * @mport: RapidIO master port info * @index: ID of RapidIO interface * @destid: Destination ID of target device * @data: 16-bit info field of RapidIO doorbell message @@ -233,6 +234,7 @@ static int fsl_rio_doorbell_send(struct /** * fsl_local_config_read - Generate a MPC85xx local config space read + * @mport: RapidIO master port info * @index: ID of RapdiIO interface * @offset: Offset into configuration space * @len: Length (in bytes) of the maintenance transaction @@ -254,6 +256,7 @@ static int fsl_local_config_read(struct /** * fsl_local_config_write - Generate a MPC85xx local config space write + * @mport: RapidIO master port info * @index: ID of RapdiIO interface * @offset: Offset into configuration space * @len: Length (in bytes) of the maintenance transaction @@ -276,6 +279,7 @@ static int fsl_local_config_write(struct /** * fsl_rio_config_read - Generate a MPC85xx read maintenance transaction + * @mport: RapidIO master port info * @index: ID of RapdiIO interface * @destid: Destination ID of transaction * @hopcount: Number of hops to target device @@ -317,6 +321,7 @@ fsl_rio_config_read(struct rio_mport *mp /** * fsl_rio_config_write - Generate a MPC85xx write maintenance transaction + * @mport: RapidIO master port info * @index: ID of RapdiIO interface * @destid: Destination ID of transaction * @hopcount: Number of hops to target device @@ -357,6 +362,7 @@ fsl_rio_config_write(struct rio_mport *m /** * fsl_rio_map_inb_mem -- Mapping inbound memory region. + * @mport: RapidIO master port info * @lstart: Local memory space start address. * @rstart: RapidIO space start address. * @size: The mapping region size. @@ -419,6 +425,7 @@ static int fsl_rio_map_inb_mem(struct ri /** * fsl_rio_map_outb_mem -- Mapping outbound memory region. + * @mport: RapidIO master port info * @lstart: Local memory space start address. * @rstart: RapidIO space start address. * @size: The mapping region size. @@ -487,6 +494,7 @@ static int fsl_rio_map_outb_mem(struct r /** * fsl_rio_unmap_inb_mem -- Unmapping inbound memory region. + * @mport: RapidIO master port info * @lstart: Local memory space start address. */ static void fsl_rio_unmap_inb_mem(struct rio_mport *mport, @@ -510,6 +518,7 @@ static void fsl_rio_unmap_inb_mem(struct /** * fsl_rio_unmap_inb_mem -- Unmapping outbound memory region. + * @mport: RapidIO master port info * @lstart: Local memory space start address. */ static void fsl_rio_unmap_outb_mem(struct rio_mport *mport, @@ -1201,8 +1210,8 @@ static inline void fsl_rio_info(struct d } /** - * fsl_rio_setup - Setup MPC85xx RapidIO interface - * @fsl_rio_setup - Setup Freescale PowerPC RapidIO interface + * fsl_rio_setup - Setup Freescale PowerPC RapidIO interface + * @dev: of_device pointer * * Initializes MPC85xx RapidIO hardware interface, configures * master port with system-specific info, and registers the diff -puN drivers/rapidio/rio.c~rapidio-fix-kernel-doc-problems drivers/rapidio/rio.c --- a/drivers/rapidio/rio.c~rapidio-fix-kernel-doc-problems +++ a/drivers/rapidio/rio.c @@ -353,7 +353,7 @@ int rio_release_outb_dbell(struct rio_de * @mport: Master port * @res: Resource need be requested. * - * Return: 0 - Successed. + * Return: 0 - Success. */ int rio_request_io_region(struct rio_mport *mport, struct resource *res) { @@ -369,7 +369,7 @@ EXPORT_SYMBOL_GPL(rio_request_io_region) * @mport: Master port * @size: IO resource size * @name: Resource name - * @flag: Flag for resource + * @flags: Flags for resource * @res: Return resource which has been allocated. */ int rio_alloc_io(struct rio_mport *mport, resource_size_t size, @@ -476,7 +476,7 @@ void rio_unmap_outb_region(struct rio_mp * @mport: Master port * @mem: Inbound region descriptor * - * Return 0 is successed. + * Return 0 -- success. */ int rio_release_inb_region(struct rio_mport *mport, struct rio_mem *mem) { @@ -508,7 +508,7 @@ int rio_release_inb_region(struct rio_mp * @name: The region name * @owner: The region owner driver id * - * Retrun: The rio_mem struction for inbound memory descriptor. + * Return: The rio_mem struction for inbound memory descriptor. * * This function is used for request RapidIO space inbound region. If the size * less than 4096 or not aligned to 2^N, it will be adjusted. The function will @@ -582,7 +582,7 @@ err: * @mport: Master port * @mem: Outbound region descriptor * - * Return 0 is successed. + * Return 0 -- success. */ int rio_release_outb_region(struct rio_mport *mport, struct rio_mem *mem) { diff -puN include/linux/rio.h~rapidio-fix-kernel-doc-problems include/linux/rio.h --- a/include/linux/rio.h~rapidio-fix-kernel-doc-problems +++ a/include/linux/rio.h @@ -165,9 +165,13 @@ enum rio_phy_type { * @outb_msg: RIO outbound message event descriptors * @host_deviceid: Host device ID associated with this master port * @ops: configuration space functions + * @mops: memory operations functions * @id: Port ID, unique among all ports * @index: Port index, unique among all port interfaces of the same type + * @sys_size: RapidIO common transport system size + * @phy_type: RapidIO phy type * @name: Port name string + * @dev: struct device pointer * @priv: Master port private data */ struct rio_mport { @@ -331,6 +335,7 @@ struct rio_route_ops { * @node: Node in list of memories * @virt: The virtual address for mapped memory accessing. * @owner: The owner id of this memory. + * @dev: device-specific pointer * @size: The size of memory space, it should same to iores and riores. * @iores: The resource of local IO region for mapping. * @riores: The resource of mapped RapidIO space region. _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are origin.patch rapidio-fix-docbook-references.patch rapidio-fix-kernel-doc-problems.patch git-kvm.patch 8390-split-8390-support-into-a-pausing-and-a-non-pausing-driver-core.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch git-ocfs2.patch git-scsi-misc.patch git-unionfs.patch mempolicy-update-numa-memory-policy-documentation.patch mempolicy-disallow-static-or-relative-flags-for-local-preferred-mode.patch let-log_buf_shift-default-to-17.patch sysrq-add-show-backtrace-on-all-cpus-function.patch isolate-ratelimit-from-printkc-for-other-use-update.patch documentation-move-spidev_fdx-example-to-its-own-source-file.patch docbook-some-kernel-locking-fixes.patch kernel-doc-detect-prevent-duplicate-doc-section-names.patch kernel-doc-detect-trailing-kernel-doc-line-trash.patch documentation-build-source-files-in-documentation-sub-dir.patch documentation-build-source-files-in-documentation-sub-dir-update.patch documentation-build-source-files-in-documentation-sub-dir-disable.patch add-a-document-describing-the-resource-counter-abstraction-v2.patch add-a-document-describing-the-resource-counter-abstraction-v2-fix.patch jbd2-fix-kernel-doc-notation.patch dma-add-dma_map_attrs-interfaces.patch dma-document-dma_map_attrs-interfaces.patch dma-ia64-update-ia64-machvecs-swiotlbc.patch ib-expand-ib_umem_get-prototype.patch doc-fix-dma-api-function-parameters.patch basic-braille-screen-reader-support-makefile-fix.patch add-macros-similar-to-min-max-min_t-max_t-doc.patch infrastructure-to-debug-dynamic-objects.patch debugobjects-add-documentation.patch debugobjects-add-timer-specific-object-debugging-code.patch add-hrtimer-specific-debugobjects-code.patch profile-likely-unlikely-macros.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html