From patchwork Mon Jan 13 16:21:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 3478101 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0527CC02DC for ; Mon, 13 Jan 2014 16:21:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E440A200EC for ; Mon, 13 Jan 2014 16:21:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3803200DC for ; Mon, 13 Jan 2014 16:21:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752992AbaAMQV1 (ORCPT ); Mon, 13 Jan 2014 11:21:27 -0500 Received: from mail-wg0-f43.google.com ([74.125.82.43]:60944 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751888AbaAMQVZ (ORCPT ); Mon, 13 Jan 2014 11:21:25 -0500 Received: by mail-wg0-f43.google.com with SMTP id k14so6696269wgh.34 for ; Mon, 13 Jan 2014 08:21:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:mime-version :content-transfer-encoding; bh=Yvm3z7SsHhB3qGGo8WipBUdRk2j0jwp9nnhlu1D4U4U=; b=ZBl4dykvG5+1pK06xXYXkjX8Cfa+iyy/nm1cYAWQRiFW1MpZWSid+Ygq/kkviRhTCX hGWSAWPUEPa8AqbwTCXkWhrVGmOdUk0iI+hez7DfO+jmkEjVbGwO1EP4S0573YHBhy6m kaz4YY5CIh0MUS5ydCYQksRj/ug2HspjzHAJWkwJIyxRRncZv4KuYyq2+zWSdkldLaHd eGs4SjnT1ju9kv8Yv3Yjo7Gmx3ZBsG7o2vnKtmrVwkivwT8BFolZBkPJOwihi6g6vf2n JVPxi8x19wP326Ktncy7251ccFvsaP5WqalKPKH9+eKqwdPBE8rTrtOz/7ieDCo4r1SR liug== X-Received: by 10.180.108.132 with SMTP id hk4mr16515923wib.12.1389630083962; Mon, 13 Jan 2014 08:21:23 -0800 (PST) Received: from [192.168.1.100] (188.29.100.241.threembb.co.uk. [188.29.100.241]) by mx.google.com with ESMTPSA id e1sm18581923wij.7.2014.01.13.08.21.19 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Mon, 13 Jan 2014 08:21:23 -0800 (PST) Message-ID: <1389630069.2590.2.camel@canaries32-MCP7A> Subject: [PATCH 3/6] staging: vt6656: sparse fixes ethtool_ioctl Use struct ifreq * From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org Date: Mon, 13 Jan 2014 16:21:09 +0000 X-Mailer: Evolution 3.10.1-2ubuntu2 Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace useraddr with direct point to struct ifreq->ifr_data sparse warnings main_usb.c:1443:44: warning: cast removes address space of expression main_usb.c:1454:37: warning: incorrect type in argument 2 (different address spaces) main_usb.c:1454:37: expected void const [noderef] *from main_usb.c:1454:37: got void *useraddr main_usb.c:1462:34: warning: incorrect type in argument 1 (different address spaces) main_usb.c:1462:34: expected void [noderef] *to main_usb.c:1462:34: got void *useraddr Signed-off-by: Malcolm Priestley --- drivers/staging/vt6656/main_usb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 59c2430..9e5ed30 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -219,7 +219,7 @@ static bool device_init_defrag_cb(struct vnt_private *pDevice); static void device_init_diversity_timer(struct vnt_private *pDevice); static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev); -static int ethtool_ioctl(struct net_device *dev, void *useraddr); +static int ethtool_ioctl(struct net_device *dev, struct ifreq *); static void device_free_tx_bufs(struct vnt_private *pDevice); static void device_free_rx_bufs(struct vnt_private *pDevice); static void device_free_int_bufs(struct vnt_private *pDevice); @@ -1440,18 +1440,18 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) break; case SIOCETHTOOL: - return ethtool_ioctl(dev, (void *) rq->ifr_data); + return ethtool_ioctl(dev, rq); } return rc; } -static int ethtool_ioctl(struct net_device *dev, void *useraddr) +static int ethtool_ioctl(struct net_device *dev, struct ifreq *rq) { u32 ethcmd; - if (copy_from_user(ðcmd, useraddr, sizeof(ethcmd))) + if (copy_from_user(ðcmd, rq->ifr_data, sizeof(ethcmd))) return -EFAULT; switch (ethcmd) { @@ -1459,7 +1459,7 @@ static int ethtool_ioctl(struct net_device *dev, void *useraddr) struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO}; strncpy(info.driver, DEVICE_NAME, sizeof(info.driver)-1); strncpy(info.version, DEVICE_VERSION, sizeof(info.version)-1); - if (copy_to_user(useraddr, &info, sizeof(info))) + if (copy_to_user(rq->ifr_data, &info, sizeof(info))) return -EFAULT; return 0; }