From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5008DC43603 for ; Tue, 2 Mar 2021 09:49:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07EB864EFC for ; Tue, 2 Mar 2021 09:49:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382523AbhCBJjh (ORCPT ); Tue, 2 Mar 2021 04:39:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1837943AbhCBJPe (ORCPT ); Tue, 2 Mar 2021 04:15:34 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BDB1C061756 for ; Tue, 2 Mar 2021 01:14:37 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id gt32so22294002ejc.6 for ; Tue, 02 Mar 2021 01:14:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pKsB8xXAte7eLnnt+TkAlNuRDcZqKIjPaWBZfUAhV9w=; b=MLz9oR/tMNKres9w8RtV5LTyjCrrZ8gEfgMLW5gcEYaB3jMdxuh50RQ9R0X1As9joR 3AMval8t9cMC7Xnuu8x2GFlfniahFMGLuUWK8lqiW54fVlqRIaXJ3wsZMkntxf+j7aQ9 doAdaWaRIdMTj5ttGAVVgMbNZz36r/ZRrJOb3STTmFlOUMOt9K101hU5YMcc0zOXiTCb 7FCgv6rw69WZklvLCNVR23YRbt3G+lmONVW1eg81BVy8QHoKq4KXm1uSBb1i9fB/P0z5 MuPqbJZnUs0OsFb1IeYYWdzVkANEpii1ZDj3tZ3QsPckoh8XusgCFn+GAyYuPjy2MkPy o0EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pKsB8xXAte7eLnnt+TkAlNuRDcZqKIjPaWBZfUAhV9w=; b=CqLhjPpMTN9T4107Gso6uQhu67FXg4vaAfDs9ARMJwaMvnRp4Ma9/c7xJLnZr5zgvM d9MZlIvVZD2AGG/RsQHNUK/C8ukgIv2Aisex2iAQn9bC/rxzItLalk91sOYUvzXd1e/V wJEgxL8JwArfC1WYgltmhzB/jCbwVqr3S86+uNcu/MyfBEZGdEMxWx5o6JAzhM4llePr aTiySblsvxkN6v2PULF8QB2IL4WB6XDEL2m1Cumsgqt5a3nsGClFLP4YOmJkXQ0z7TZl x5N/Nmbd8ybbOR9hvwlZequAkvSoioXOvSRwIpdXUaX8Pgi4rtPfX92At9x/VxNuShdO IwqA== X-Gm-Message-State: AOAM531LY5kztrjxtn+oHkq2m3TflBrmX+6k5gVWAH3kDqJ2AIaCj6lI jInnvLgWj34pbRZStIEpHJ7iMr6IJOI= X-Google-Smtp-Source: ABdhPJy4V0lje09bKbN1A86kKUKU/ygta/xtjQnLYWz2oIngTDPjWqgRHROFKA3dLNltr0/uNspDMA== X-Received: by 2002:a17:906:801:: with SMTP id e1mr9570167ejd.465.1614676475667; Tue, 02 Mar 2021 01:14:35 -0800 (PST) Received: from localhost.localdomain (2a02-a456-df9f-1-7d91-8a91-1a5-83c8.fixed6.kpn.net. [2a02:a456:df9f:1:7d91:8a91:1a5:83c8]) by smtp.gmail.com with ESMTPSA id o4sm17294938ejj.45.2021.03.02.01.14.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Mar 2021 01:14:34 -0800 (PST) From: gabriele.modena@gmail.com To: linux-kernel@vger.kernel.org Cc: devel@driverdev.osuosl.org, Gabriele Modena Subject: [PATCH] wimax: attempt to address style issues. Date: Tue, 2 Mar 2021 10:11:02 +0100 Message-Id: <20210302091102.1598-1-gabriele.modena@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gabriele Modena When running checkpatch.pl on op-msg.c, op-rfkill.c and stack.c I noticed that they contained a few style issues at warning level of severity. This patch is both an attempt to address the warnings, as well as a way for me to familiarise with the linux kernel contribution process, by following tasks proposed by a popular online challenge. Signed-off-by: Gabriele Modena --- drivers/staging/wimax/op-msg.c | 8 ++++---- drivers/staging/wimax/op-rfkill.c | 7 ++++--- drivers/staging/wimax/stack.c | 12 ++++++------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/staging/wimax/op-msg.c b/drivers/staging/wimax/op-msg.c index e20ac7d84e82..11da48bf704f 100644 --- a/drivers/staging/wimax/op-msg.c +++ b/drivers/staging/wimax/op-msg.c @@ -142,8 +142,8 @@ struct sk_buff *wimax_msg_alloc(struct wimax_dev *wimax_dev, } result = nla_put(skb, WIMAX_GNL_MSG_DATA, size, msg); if (result < 0) { - dev_err(dev, "no memory to add payload (msg %p size %zu) in " - "attribute: %d\n", msg, size, result); + dev_err(dev, "no memory to add payload (msg %p size %zu) in attribute: %d\n", + msg, size, result); goto error_nla_put; } genlmsg_end(skb, genl_msg); @@ -260,6 +260,7 @@ int wimax_msg_send(struct wimax_dev *wimax_dev, struct sk_buff *skb) struct device *dev = wimax_dev_to_dev(wimax_dev); void *msg = skb->data; size_t size = skb->len; + might_sleep(); d_printf(1, dev, "CTX: wimax msg, %zu bytes\n", size); @@ -340,8 +341,7 @@ int wimax_gnl_doit_msg_from_user(struct sk_buff *skb, struct genl_info *info) /* Unpack arguments */ result = -EINVAL; if (info->attrs[WIMAX_GNL_MSG_DATA] == NULL) { - dev_err(dev, "WIMAX_GNL_MSG_FROM_USER: can't find MSG_DATA " - "attribute\n"); + dev_err(dev, "WIMAX_GNL_MSG_FROM_USER: can't find MSG_DATA attribute\n"); goto error_no_data; } msg_buf = nla_data(info->attrs[WIMAX_GNL_MSG_DATA]); diff --git a/drivers/staging/wimax/op-rfkill.c b/drivers/staging/wimax/op-rfkill.c index 78b294481a59..52612ed09183 100644 --- a/drivers/staging/wimax/op-rfkill.c +++ b/drivers/staging/wimax/op-rfkill.c @@ -294,7 +294,8 @@ int wimax_rfkill(struct wimax_dev *wimax_dev, enum wimax_rf_state state) /* While initializing, < 1.4.3 wimax-tools versions use * this call to check if the device is a valid WiMAX * device; so we allow it to proceed always, - * considering the radios are all off. */ + * considering the radios are all off. + */ if (result == -ENOMEDIUM && state == WIMAX_RF_QUERY) result = WIMAX_RF_OFF << 1 | WIMAX_RF_OFF; goto error_not_ready; @@ -378,6 +379,7 @@ int wimax_rfkill_add(struct wimax_dev *wimax_dev) void wimax_rfkill_rm(struct wimax_dev *wimax_dev) { struct device *dev = wimax_dev_to_dev(wimax_dev); + d_fnstart(3, dev, "(wimax_dev %p)\n", wimax_dev); rfkill_unregister(wimax_dev->rfkill); rfkill_destroy(wimax_dev->rfkill); @@ -415,8 +417,7 @@ int wimax_gnl_doit_rfkill(struct sk_buff *skb, struct genl_info *info) dev = wimax_dev_to_dev(wimax_dev); result = -EINVAL; if (info->attrs[WIMAX_GNL_RFKILL_STATE] == NULL) { - dev_err(dev, "WIMAX_GNL_RFKILL: can't find RFKILL_STATE " - "attribute\n"); + dev_err(dev, "WIMAX_GNL_RFKILL: can't find RFKILL_STATE attribute\n"); goto error_no_pid; } new_state = nla_get_u32(info->attrs[WIMAX_GNL_RFKILL_STATE]); diff --git a/drivers/staging/wimax/stack.c b/drivers/staging/wimax/stack.c index ace24a6dfd2d..e44158334246 100644 --- a/drivers/staging/wimax/stack.c +++ b/drivers/staging/wimax/stack.c @@ -51,9 +51,7 @@ static char wimax_debug_params[128]; module_param_string(debug, wimax_debug_params, sizeof(wimax_debug_params), 0644); MODULE_PARM_DESC(debug, - "String of space-separated NAME:VALUE pairs, where NAMEs " - "are the different debug submodules and VALUE are the " - "initial debug value to set."); + "String of space-separated NAME:VALUE pairs, where NAMEs are the different debug submodules and VALUE are the initial debug value to set."); /* * Authoritative source for the RE_STATE_CHANGE attribute policy @@ -62,7 +60,7 @@ MODULE_PARM_DESC(debug, * close to where the data is generated. */ /* -static const struct nla_policy wimax_gnl_re_status_change[WIMAX_GNL_ATTR_MAX + 1] = { + * static const struct nla_policy wimax_gnl_re_status_change[WIMAX_GNL_ATTR_MAX + 1] = { [WIMAX_GNL_STCH_STATE_OLD] = { .type = NLA_U8 }, [WIMAX_GNL_STCH_STATE_NEW] = { .type = NLA_U8 }, }; @@ -156,6 +154,7 @@ int wimax_gnl_re_state_change_send( { int result = 0; struct device *dev = wimax_dev_to_dev(wimax_dev); + d_fnstart(3, dev, "(wimax_dev %p report_skb %p)\n", wimax_dev, report_skb); if (report_skb == NULL) { @@ -275,8 +274,8 @@ void __wimax_state_change(struct wimax_dev *wimax_dev, enum wimax_st new_state) /* Execute the actions of entry to the new state */ switch (new_state) { case __WIMAX_ST_NULL: - dev_err(dev, "SW BUG: wimax_dev %p entering NULL state " - "from %u\n", wimax_dev, wimax_dev->state); + dev_err(dev, "SW BUG: wimax_dev %p entering NULL state from %u\n", + wimax_dev, wimax_dev->state); WARN_ON(1); /* Nobody can enter this state */ break; case WIMAX_ST_DOWN: @@ -362,6 +361,7 @@ EXPORT_SYMBOL_GPL(wimax_state_change); enum wimax_st wimax_state_get(struct wimax_dev *wimax_dev) { enum wimax_st state; + mutex_lock(&wimax_dev->mutex); state = wimax_dev->state; mutex_unlock(&wimax_dev->mutex); -- 2.11.0