Changeset 132ab5d1 in mainline for uspace/drv/nic/ar9271/wmi.c


Ignore:
Timestamp:
2018-01-30T03:20:45Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5a6cc679
Parents:
8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/nic/ar9271/wmi.c

    r8bfb163 r132ab5d1  
    3535#include <usb/debug.h>
    3636#include <errno.h>
    37 #include <malloc.h>
     37#include <str_error.h>
     38#include <stdlib.h>
    3839#include <mem.h>
    3940#include <byteorder.h>
    … …  
    4647 * @param res        Stored result.
    4748 *
    48  * @return EOK if succeed, negative error code otherwise.
     49 * @return EOK if succeed, error code otherwise.
    4950 *
    5051 */
    … …  
    7879 * @param val        Value to be written
    7980 *
    80  * @return EOK if succeed, negative error code otherwise.
     81 * @return EOK if succeed, error code otherwise.
    8182 *
    8283 */
    … …  
    111112 * @param clear_bit  Bit to be cleared.
    112113 *
    113  * @return EOK if succeed, negative error code otherwise.
     114 * @return EOK if succeed, error code otherwise.
    114115 *
    115116 */
    … …  
    145146 * @param set_bit    Bit to be set.
    146147 *
    147  * @return EOK if succeed, negative error code otherwise.
     148 * @return EOK if succeed, error code otherwise.
    148149 *
    149150 */
    … …  
    160161 * @param clear_bit  Bit to be cleared.
    161162 *
    162  * @return EOK if succeed, negative error code otherwise.
     163 * @return EOK if succeed, error code otherwise.
    163164 *
    164165 */
    … …  
    175176 * @param elements   Number of elements in array.
    176177 *
    177  * @return EOK if succeed, negative error code otherwise.
     178 * @return EOK if succeed, error code otherwise.
    178179 *
    179180 */
    … …  
    219220 * @param response_buffer Buffer with response data.
    220221 *
    221  * @return EOK if succeed, negative error code otherwise.
     222 * @return EOK if succeed, error code otherwise.
    222223 *
    223224 */
    … …  
    245246        if (rc != EOK) {
    246247                free(buffer);
    247                 usb_log_error("Failed to send WMI message. Error: %d\n", rc);
     248                usb_log_error("Failed to send WMI message. Error: %s\n", str_error_name(rc));
    248249                return rc;
    249250        }
    … …  
    268269                        free(buffer);
    269270                        usb_log_error("Failed to receive WMI message response. "
    270                             "Error: %d\n", rc);
     271                            "Error: %s\n", str_error_name(rc));
    271272                        return rc;
    272273                }
Note: See TracChangeset for help on using the changeset viewer.