From patchwork Mon Sep 12 09:38:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prameela Rani Garnepudi X-Patchwork-Id: 9326045 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 996EE60231 for ; Mon, 12 Sep 2016 09:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89DBF28CAB for ; Mon, 12 Sep 2016 09:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E64928CB2; Mon, 12 Sep 2016 09:43:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1F8628CAB for ; Mon, 12 Sep 2016 09:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757525AbcILJnz (ORCPT ); Mon, 12 Sep 2016 05:43:55 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35331 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757504AbcILJny (ORCPT ); Mon, 12 Sep 2016 05:43:54 -0400 Received: by mail-pa0-f66.google.com with SMTP id pp5so7548900pac.2 for ; Mon, 12 Sep 2016 02:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=11W1m+xVGq+ifTGyI+3E2xeaV8IripQeXsBTWr5a4Y4=; b=bL7b6CrqhVWOcTHzNgaWT8eWeFXj5bHPcxjLNaouDzd4qO6ib5PlgrXrFPHnRemtw3 Yn3uZ3ULI4DojJoNkxNJncgzKqiPzcXl2k6mIRejPUL4MTmJPBlz11SsLxVVy1n+nY/R /wkYXjqD60lsrjrUM9EEWV0s+9ItK9dsgh7qYDCoQl2K64r9RG+cSxBVGbF6y31ohuG8 FP3ZJnOrRBX1LuFKcizXVLboji8+0mMuihWDPzDUbRGrY2ytYi61geuGbl83EKiWgvl9 mh9XQ9SpF4JEXFfUOVTPVBeA0mJ1eS6mkmJJ1eU9u0cI/wPQnPN6sr960vAt2H2vAVDF 03Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=11W1m+xVGq+ifTGyI+3E2xeaV8IripQeXsBTWr5a4Y4=; b=lTB6mgY2ahMuuoXPiKlJEiLh/Uc5hxgYXL4q/mxSpLWSyiTmyz2+hC/epc3c2wXSQs le3aUjlYSlGE8GGYaf5XYEakV9gaDjWG4ESVlw/EhZ9mrBU8fLoieHFm3NsjlJk5MgHk JHxHhyPla9Gw44MhM68lMbCooArR4GJp6Cqnz6yAj/qSsU6zgNEPgIHEIthpTNMhFMuc UuTetnBbYzqSvCbH2Fn+d65o+7hD1oyrUBtZmHQbg/a9WBVbtcaENnDEQHodnInWZxm4 j0jBKnKb60TILE046q3dCXsJtrYGIuXn7+S2Z4tshp9rUa7n4jVx0H8cTpKVy2399dEP IVfg== X-Gm-Message-State: AE9vXwPJnh8ORwjzcQAiiFr6UUTg7JuGCVPAYkXf8VwOqMWuli2v82GmViOe6Sx4JTn8Qg== X-Received: by 10.66.131.48 with SMTP id oj16mr31652496pab.126.1473673428772; Mon, 12 Sep 2016 02:43:48 -0700 (PDT) Received: from lapt225.localdomain ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id 10sm21920168paq.20.2016.09.12.02.43.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 02:43:48 -0700 (PDT) From: Prameela Rani Garnepudi To: linux-wireless@vger.kernel.org, kvalo@codeaurora.org, johannes.berg@intel.com, hofrat@osadl.org Cc: prameela.j04cs@gmail.com, prameela.garnepudi@redpinesignals.com Subject: [PATCH 8/9] rsi: code clean up and replaced ctrl message timeouts with macros in file rsi_91x_usb.c Date: Mon, 12 Sep 2016 15:08:23 +0530 Message-Id: <340487567235056703e4c97170c63cb719fa5460.1473669618.git.prameela.j04cs@gmail.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: References: In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Prameela Rani Garnepudi --- drivers/net/wireless/rsi/rsi_91x_usb.c | 42 +++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c index ef5d394..21957dd 100644 --- a/drivers/net/wireless/rsi/rsi_91x_usb.c +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c @@ -1,6 +1,9 @@ /** * Copyright (c) 2014 Redpine Signals Inc. * + * Developers: + * Prameela Rani Garnepudi 2016 + * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. @@ -19,7 +22,7 @@ #include "rsi_usb.h" /** - * rsi_usb_card_write() - This function writes to the USB Card. + * rsi_usb_card_write() - This function writes data to the USB Card. * @adapter: Pointer to the adapter structure. * @buf: Pointer to the buffer from where the data has to be taken. * @len: Length to be written. @@ -34,7 +37,7 @@ static int rsi_usb_card_write(struct rsi_hw *adapter, { struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev; int status; - s32 transfer; + int transfer; status = usb_bulk_msg(dev->usbdev, usb_sndbulkpipe(dev->usbdev, @@ -46,7 +49,7 @@ static int rsi_usb_card_write(struct rsi_hw *adapter, if (status < 0) { rsi_dbg(ERR_ZONE, - "Card write failed with error code :%10d\n", status); + "Card write failed with error code :%d\n", status); dev->write_fail = 1; } return status; @@ -155,11 +158,11 @@ static int rsi_usb_reg_read(struct usb_device *usbdev, u16 len) { u8 *buf; - int status = -ENOMEM; + int status = 0; buf = kmalloc(0x04, GFP_KERNEL); if (!buf) - return status; + return -ENOMEM; status = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), @@ -168,7 +171,7 @@ static int rsi_usb_reg_read(struct usb_device *usbdev, ((reg & 0xffff0000) >> 16), (reg & 0xffff), (void *)buf, len, - HZ * 5); + USB_CTRL_GET_TIMEOUT); *value = (buf[0] | (buf[1] << 8)); if (status < 0) { @@ -197,11 +200,11 @@ static int rsi_usb_reg_write(struct usb_device *usbdev, u16 len) { u8 *usb_reg_buf; - int status = -ENOMEM; + int status = 0; usb_reg_buf = kmalloc(0x04, GFP_KERNEL); if (!usb_reg_buf) - return status; + return -ENOMEM; usb_reg_buf[0] = (value & 0x00ff); usb_reg_buf[1] = (value & 0xff00) >> 8; @@ -216,7 +219,7 @@ static int rsi_usb_reg_write(struct usb_device *usbdev, (reg & 0xffff), (void *)usb_reg_buf, len, - HZ * 5); + USB_CTRL_SET_TIMEOUT); if (status < 0) { rsi_dbg(ERR_ZONE, "%s: Reg write failed with error code :%d\n", @@ -275,11 +278,11 @@ static int rsi_rx_urb_submit(struct rsi_hw *adapter) /** * rsi_usb_write_register_multiple() - This function writes multiple bytes of - * information to multiple registers. - * @adapter: Pointer to the adapter structure. - * @addr: Address of the register. - * @data: Pointer to the data that has to be written. - * @count: Number of multiple bytes to be written on to the registers. + * information to the given address. + * @adapter: Pointer to the adapter structure. + * @addr: Address of the register. + * @data: Pointer to the data that has to be written. + * @count: Number of multiple bytes to be written on to the registers. * * Return: status: 0 on success, a negative error code on failure. */ @@ -308,16 +311,17 @@ int rsi_usb_write_register_multiple(struct rsi_hw *adapter, (addr & 0xffff), (void *)buf, transfer, - HZ * 5); + USB_CTRL_SET_TIMEOUT); if (status < 0) { rsi_dbg(ERR_ZONE, "Reg write failed with error code :%d\n", status); - } else { - count -= transfer; - data += transfer; - addr += transfer; + kfree(buf); + return status; } + count -= transfer; + data += transfer; + addr += transfer; } kfree(buf);