Commit f975c995 authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman

staging: gasket: core: simplify comments for static functions

Static functions don't need kernel doc formatting, can be simplified.
Reformat comments that can be single-line.  Remove extraneous text.
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 904bb9cc
...@@ -199,11 +199,7 @@ MODULE_AUTHOR("Rob Springer <rspringer@google.com>"); ...@@ -199,11 +199,7 @@ MODULE_AUTHOR("Rob Springer <rspringer@google.com>");
module_init(gasket_init); module_init(gasket_init);
module_exit(gasket_exit); module_exit(gasket_exit);
/* /* Perform a standard Gasket callback. */
* Perform a standard Gasket callback.
* @gasket_dev: Device specific pointer to forward.
* @cb_function: Standard callback to perform.
*/
static inline int check_and_invoke_callback( static inline int check_and_invoke_callback(
struct gasket_dev *gasket_dev, int (*cb_function)(struct gasket_dev *)) struct gasket_dev *gasket_dev, int (*cb_function)(struct gasket_dev *))
{ {
...@@ -219,13 +215,7 @@ static inline int check_and_invoke_callback( ...@@ -219,13 +215,7 @@ static inline int check_and_invoke_callback(
return ret; return ret;
} }
/* /* Perform a standard Gasket callback without grabbing gasket_dev->mutex. */
* Perform a standard Gasket callback
* without grabbing gasket_dev->mutex.
* @gasket_dev: Device specific pointer to forward.
* @cb_function: Standard callback to perform.
*
*/
static inline int gasket_check_and_invoke_callback_nolock( static inline int gasket_check_and_invoke_callback_nolock(
struct gasket_dev *gasket_dev, int (*cb_function)(struct gasket_dev *)) struct gasket_dev *gasket_dev, int (*cb_function)(struct gasket_dev *))
{ {
...@@ -240,9 +230,8 @@ static inline int gasket_check_and_invoke_callback_nolock( ...@@ -240,9 +230,8 @@ static inline int gasket_check_and_invoke_callback_nolock(
} }
/* /*
* Returns nonzero if the gasket_cdev_info is owned by the current thread group * Return nonzero if the gasket_cdev_info is owned by the current thread group
* ID. * ID.
* @info: Device node info.
*/ */
static int gasket_owned_by_current_tgid(struct gasket_cdev_info *info) static int gasket_owned_by_current_tgid(struct gasket_cdev_info *info)
{ {
...@@ -410,14 +399,9 @@ void gasket_unregister_device(const struct gasket_driver_desc *driver_desc) ...@@ -410,14 +399,9 @@ void gasket_unregister_device(const struct gasket_driver_desc *driver_desc)
} }
EXPORT_SYMBOL(gasket_unregister_device); EXPORT_SYMBOL(gasket_unregister_device);
/** /*
* Allocate a Gasket device. * Allocate and initialize a Gasket device structure, add the device to the
* @internal_desc: Pointer to the internal data for the device driver. * device list.
* @pdev: Pointer to the Gasket device pointer, the allocated device.
* @kobj_name: PCIe name for the device
*
* Description: Allocates and initializes a Gasket device structure.
* Adds the device to the device list.
* *
* Returns 0 if successful, a negative error code otherwise. * Returns 0 if successful, a negative error code otherwise.
*/ */
...@@ -476,13 +460,7 @@ static int gasket_alloc_dev( ...@@ -476,13 +460,7 @@ static int gasket_alloc_dev(
return 0; return 0;
} }
/* /* Free a Gasket device. */
* Free a Gasket device.
* @internal_dev: Gasket device pointer; the device to unregister and free.
*
* Description: Removes the device from the device list and frees
* the Gasket device structure.
*/
static void gasket_free_dev(struct gasket_dev *gasket_dev) static void gasket_free_dev(struct gasket_dev *gasket_dev)
{ {
struct gasket_internal_desc *internal_desc = gasket_dev->internal_desc; struct gasket_internal_desc *internal_desc = gasket_dev->internal_desc;
...@@ -496,7 +474,7 @@ static void gasket_free_dev(struct gasket_dev *gasket_dev) ...@@ -496,7 +474,7 @@ static void gasket_free_dev(struct gasket_dev *gasket_dev)
} }
/* /*
* Finds the next free gasket_internal_dev slot. * Find the next free gasket_internal_dev slot.
* *
* Returns the located slot number on success or a negative number on failure. * Returns the located slot number on success or a negative number on failure.
*/ */
...@@ -533,10 +511,8 @@ static int gasket_find_dev_slot( ...@@ -533,10 +511,8 @@ static int gasket_find_dev_slot(
return i; return i;
} }
/** /*
* PCI subsystem probe function. * PCI subsystem probe function.
* @pci_dev: PCI device pointer to the new device.
* @id: PCI device id structure pointer, the vendor and device ids.
* *
* Called when a Gasket device is found. Allocates device metadata, maps device * Called when a Gasket device is found. Allocates device metadata, maps device
* memory, and calls gasket_enable_dev to prepare the device for active use. * memory, and calls gasket_enable_dev to prepare the device for active use.
...@@ -641,7 +617,6 @@ static int gasket_pci_probe( ...@@ -641,7 +617,6 @@ static int gasket_pci_probe(
/* /*
* PCI subsystem remove function. * PCI subsystem remove function.
* @pci_dev: PCI device pointer; the device to remove.
* *
* Called to remove a Gasket device. Finds the device in the device list and * Called to remove a Gasket device. Finds the device in the device list and
* cleans up metadata. * cleans up metadata.
...@@ -694,8 +669,6 @@ static void gasket_pci_remove(struct pci_dev *pci_dev) ...@@ -694,8 +669,6 @@ static void gasket_pci_remove(struct pci_dev *pci_dev)
/* /*
* Setup PCI & set up memory mapping for the specified device. * Setup PCI & set up memory mapping for the specified device.
* @pci_dev: pointer to the particular PCI device.
* @internal_dev: Corresponding Gasket device pointer.
* *
* Enables the PCI device, reads the BAR registers and sets up pointers to the * Enables the PCI device, reads the BAR registers and sets up pointers to the
* device's memory mapped IO space. * device's memory mapped IO space.
...@@ -746,8 +719,6 @@ static void gasket_cleanup_pci(struct gasket_dev *gasket_dev) ...@@ -746,8 +719,6 @@ static void gasket_cleanup_pci(struct gasket_dev *gasket_dev)
/* /*
* Maps the specified bar into kernel space. * Maps the specified bar into kernel space.
* @internal_dev: Device possessing the BAR to map.
* @bar_num: The BAR to map.
* *
* Returns 0 on success, a negative error code otherwise. * Returns 0 on success, a negative error code otherwise.
* A zero-sized BAR will not be mapped, but is not an error. * A zero-sized BAR will not be mapped, but is not an error.
...@@ -824,7 +795,6 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num) ...@@ -824,7 +795,6 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num)
/* /*
* Releases PCI BAR mapping. * Releases PCI BAR mapping.
* @internal_dev: Device possessing the BAR to unmap.
* *
* A zero-sized or not-mapped BAR will not be unmapped, but is not an error. * A zero-sized or not-mapped BAR will not be unmapped, but is not an error.
*/ */
...@@ -856,12 +826,7 @@ static void gasket_unmap_pci_bar(struct gasket_dev *dev, int bar_num) ...@@ -856,12 +826,7 @@ static void gasket_unmap_pci_bar(struct gasket_dev *dev, int bar_num)
release_mem_region(base, bytes); release_mem_region(base, bytes);
} }
/* /* Add a char device and related info. */
* Handle adding a char device and related info.
* @dev_info: Pointer to the dev_info struct for this device.
* @file_ops: The file operations for this device.
* @owner: The owning module for this device.
*/
static int gasket_add_cdev( static int gasket_add_cdev(
struct gasket_cdev_info *dev_info, struct gasket_cdev_info *dev_info,
const struct file_operations *file_ops, struct module *owner) const struct file_operations *file_ops, struct module *owner)
...@@ -881,14 +846,7 @@ static int gasket_add_cdev( ...@@ -881,14 +846,7 @@ static int gasket_add_cdev(
return 0; return 0;
} }
/* /* Perform final init and marks the device as active. */
* Performs final init and marks the device as active.
* @internal_desc: Pointer to Gasket [internal] driver descriptor structure.
* @internal_dev: Pointer to Gasket [internal] device structure.
*
* Currently forwards all work to device-specific callback; a future phase will
* extract elements of character device registration here.
*/
static int gasket_enable_dev( static int gasket_enable_dev(
struct gasket_internal_desc *internal_desc, struct gasket_internal_desc *internal_desc,
struct gasket_dev *gasket_dev) struct gasket_dev *gasket_dev)
...@@ -966,13 +924,7 @@ static int gasket_enable_dev( ...@@ -966,13 +924,7 @@ static int gasket_enable_dev(
return 0; return 0;
} }
/* /* Disable device operations. */
* Disable device operations.
* @gasket_dev: Pointer to Gasket device structure.
*
* Currently forwards all work to device-specific callback; a future phase will
* extract elements of character device unregistration here.
*/
static void gasket_disable_dev(struct gasket_dev *gasket_dev) static void gasket_disable_dev(struct gasket_dev *gasket_dev)
{ {
const struct gasket_driver_desc *driver_desc = const struct gasket_driver_desc *driver_desc =
...@@ -997,7 +949,7 @@ static void gasket_disable_dev(struct gasket_dev *gasket_dev) ...@@ -997,7 +949,7 @@ static void gasket_disable_dev(struct gasket_dev *gasket_dev)
check_and_invoke_callback(gasket_dev, driver_desc->disable_dev_cb); check_and_invoke_callback(gasket_dev, driver_desc->disable_dev_cb);
} }
/** /*
* Registered descriptor lookup. * Registered descriptor lookup.
* *
* Precondition: Called with g_mutex held (to avoid a race on return). * Precondition: Called with g_mutex held (to avoid a race on return).
...@@ -1045,16 +997,13 @@ const char *gasket_num_name_lookup( ...@@ -1045,16 +997,13 @@ const char *gasket_num_name_lookup(
} }
EXPORT_SYMBOL(gasket_num_name_lookup); EXPORT_SYMBOL(gasket_num_name_lookup);
/** /*
* Opens the char device file. * Open the char device file.
* @inode: Inode structure pointer of the device file.
* @file: File structure pointer.
* *
* Description: Called on an open of the device file. If the open is for * If the open is for writing, and the device is not owned, this process becomes
* writing, and the device is not owned, this process becomes * the owner. If the open is for writing and the device is already owned by
* the owner. If the open is for writing and the device is * some other process, it is an error. If this process is the owner, increment
* already owned by some other process, it is an error. If * the open count.
* this process is the owner, increment the open count.
* *
* Returns 0 if successful, a negative error number otherwise. * Returns 0 if successful, a negative error number otherwise.
*/ */
...@@ -1130,15 +1079,10 @@ static int gasket_open(struct inode *inode, struct file *filp) ...@@ -1130,15 +1079,10 @@ static int gasket_open(struct inode *inode, struct file *filp)
return 0; return 0;
} }
/** /*
* gasket_release - Close of the char device file. * Called on a close of the device file. If this process is the owner,
* @inode: Inode structure pointer of the device file. * decrement the open count. On last close by the owner, free up buffers and
* @file: File structure pointer. * eventfd contexts, and release ownership.
*
* Description: Called on a close of the device file. If this process
* is the owner, decrement the open count. On last close
* by the owner, free up buffers and eventfd contexts, and
* release ownership.
* *
* Returns 0 if successful, a negative error number otherwise. * Returns 0 if successful, a negative error number otherwise.
*/ */
...@@ -1199,10 +1143,6 @@ static int gasket_release(struct inode *inode, struct file *file) ...@@ -1199,10 +1143,6 @@ static int gasket_release(struct inode *inode, struct file *file)
} }
/* /*
* Permission and validity checking for mmap ops.
* @gasket_dev: Gasket device information structure.
* @vma: Standard virtual memory area descriptor.
*
* Verifies that the user has permissions to perform the requested mapping and * Verifies that the user has permissions to perform the requested mapping and
* that the provided descriptor/range is of adequate size to hold the range to * that the provided descriptor/range is of adequate size to hold the range to
* be mapped. * be mapped.
...@@ -1246,11 +1186,6 @@ static bool gasket_mmap_has_permissions( ...@@ -1246,11 +1186,6 @@ static bool gasket_mmap_has_permissions(
} }
/* /*
* Checks if an address is within the region
* allocated for coherent buffer.
* @driver_desc: driver description.
* @address: offset of address to check.
*
* Verifies that the input address is within the region allocated to coherent * Verifies that the input address is within the region allocated to coherent
* buffer. * buffer.
*/ */
...@@ -1502,11 +1437,7 @@ static int gasket_mm_vma_bar_offset( ...@@ -1502,11 +1437,7 @@ static int gasket_mm_vma_bar_offset(
return 0; return 0;
} }
/* /* Map a region of coherent memory. */
* Map a region of coherent memory.
* @gasket_dev: Gasket device handle.
* @vma: Virtual memory area descriptor with region to map.
*/
static int gasket_mmap_coherent( static int gasket_mmap_coherent(
struct gasket_dev *gasket_dev, struct vm_area_struct *vma) struct gasket_dev *gasket_dev, struct vm_area_struct *vma)
{ {
...@@ -1551,16 +1482,7 @@ static int gasket_mmap_coherent( ...@@ -1551,16 +1482,7 @@ static int gasket_mmap_coherent(
return 0; return 0;
} }
/* /* Map a device's BARs into user space. */
* Maps a device's BARs into user space.
* @filp: File structure pointer describing this node usage session.
* @vma: Standard virtual memory area descriptor.
*
* Maps the entirety of each of the device's BAR ranges into the user memory
* range specified by vma.
*
* Returns 0 on success, a negative errno on error.
*/
static int gasket_mmap(struct file *filp, struct vm_area_struct *vma) static int gasket_mmap(struct file *filp, struct vm_area_struct *vma)
{ {
int i, ret; int i, ret;
...@@ -1704,14 +1626,7 @@ static int gasket_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -1704,14 +1626,7 @@ static int gasket_mmap(struct file *filp, struct vm_area_struct *vma)
return ret; return ret;
} }
/* /* Determine the health of the Gasket device. */
* Determine the health of the Gasket device.
* @gasket_dev: Gasket device structure.
*
* Checks the underlying device health (via the device_status_cb)
* and the status of initialized Gasket code systems (currently
* only interrupts), then returns a gasket_status appropriately.
*/
static int gasket_get_hw_status(struct gasket_dev *gasket_dev) static int gasket_get_hw_status(struct gasket_dev *gasket_dev)
{ {
int status; int status;
...@@ -1750,14 +1665,10 @@ static int gasket_get_hw_status(struct gasket_dev *gasket_dev) ...@@ -1750,14 +1665,10 @@ static int gasket_get_hw_status(struct gasket_dev *gasket_dev)
/* /*
* Gasket ioctl dispatch function. * Gasket ioctl dispatch function.
* @filp: File structure pointer describing this node usage session.
* @cmd: ioctl number to handle.
* @arg: ioctl-specific data pointer.
* *
* First, checks if the ioctl is a generic ioctl. If not, it passes * Check if the ioctl is a generic ioctl. If not, pass the ioctl to the
* the ioctl to the ioctl_handler_cb registered in the driver description. * ioctl_handler_cb registered in the driver description.
* If the ioctl is a generic ioctl, the function passes it to the * If the ioctl is a generic ioctl, pass it to gasket_ioctl_handler.
* gasket_ioctl_handler in gasket_ioctl.c.
*/ */
static long gasket_ioctl(struct file *filp, uint cmd, ulong arg) static long gasket_ioctl(struct file *filp, uint cmd, ulong arg)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment