From patchwork Tue Jul 27 13:45:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 486721 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp232840jas; Tue, 27 Jul 2021 06:47:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcKoG1ZXvgtGnIfCNGbH15GP2sEQg2kus5ua7wMjDA7rnuL4388EMFgz1M579x+N2T93MX X-Received: by 2002:a17:906:3499:: with SMTP id g25mr10996137ejb.471.1627393668401; Tue, 27 Jul 2021 06:47:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627393668; cv=none; d=google.com; s=arc-20160816; b=dKNLU8Vefa9FQF7uCHqmGf7EXzqBMGNK69AzrRtP/l+bk8B18hNaocrOOEsYTmCeu3 V6YQZLAqw1YXwmE5Yt/Ew7eusu/Ss0EonVsYSR26qucjlWtNve8cmUzTemoz/pMPFL1+ yVCFIBquEg5rkgbZizRaoTMxcS1zr4kZIQZvCmEQh2dL2PtDJBZP0USKjuCLsKAZhk4f KC2ym9rnFn3mOR2zOBQboLTPtFSuSzk+u4CWMRTFLiSURs5UdYIAOjw7j6v2ayiWQy3a y+2yeRwWs070UMN1yTVUU6HmaKltoCidk/CXd7OeXLXX2Cq7xxmwa1YHj8o6kgRx6bL4 9IxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GPxhMeLWjgCWyg4n6QcvTTQpvM3T/mQ/XsQ1wY2BHgU=; b=HyDBUgCzJyzcNtE9E2nVCAy66yf3QO5/m83RUlJBAUD8aqyXdlR9h+aNi2eZ1xo8fh zn1HFUkS6Lil0VcUleGvaS+KvtasxFiqc0SjY66JPpGtTzDsYNNT5BZEwxXc/OW1ktul Yjldqy/KgdXy1ZWZ+kMQhcVvoofv3x0DZim/d+hSYxqj5uiLrtAZYuHW+CJOhwHzDRiF lsYeNO0iJzilzulcH9FH8mbSCrk4WBJFnWoT0Y3O01JtDV2kUT8xLcbAFr9qUa9lLX3I cEi7PUpXZpxIQegbmtRQWRZUYG35R5tsY05tECEq8F/fk2lRjYpoWSJwicf6cI8riHD+ 6/og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hH20wxAC; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r9si2970195eje.250.2021.07.27.06.47.48; Tue, 27 Jul 2021 06:47:48 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hH20wxAC; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237452AbhG0NrZ (ORCPT + 8 others); Tue, 27 Jul 2021 09:47:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:46636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237154AbhG0Nqt (ORCPT ); Tue, 27 Jul 2021 09:46:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0B0A961AAA; Tue, 27 Jul 2021 13:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627393603; bh=igl5sTn80aTfHONV/lSrGXvxVew4hUjDcxxzAbMcnto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hH20wxAClyBMroZmsggUj+6wwGbc/kR7k35MOdKq5wy2AzRM6A3P9meC/N3LywSFn je1mi2yIJBot5cOehH3Ya4oRU1KRbrBwQ242nddWbPSIao9bKlc5Wa867tuSwxrvuy S2cnNR33xBMqUtTUjs3BjdGvT8xUB2Qibjq92NfvLGxBoPCzlmH1ZY2V0bOSAJt0Sk GRny1Xz5+cFi3klGxE+QBHIGKxsK4nfMpBWvxiiQVe9Bh/Jj1368bv+tQPAYvhXG0P Li0C7KyVkabMGSWpZZ8LULVHuwD5DpGkixlExxTPpowz1dZ76D3rnB/faXwrf+jLdG G3mHjfcQegaLg== From: Arnd Bergmann To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Arnd Bergmann Subject: [PATCH net-next v3 25/31] wan: cosa: remove dead cosa_net_ioctl() function Date: Tue, 27 Jul 2021 15:45:11 +0200 Message-Id: <20210727134517.1384504-26-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210727134517.1384504-1-arnd@kernel.org> References: <20210727134517.1384504-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann The ndo_do_ioctl callback is never called with the COSAIO* commands, so this is never used. Call the hdlc_ioctl function directly instead. Any user space code that relied on this function working as intended has never worked in a mainline kernel since before linux-1.0. Cc: "Jan \"Yenya\" Kasprzak" Signed-off-by: Arnd Bergmann --- drivers/net/wan/cosa.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) -- 2.29.2 diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 43caab0b7dee..4c0e9cf02217 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -267,7 +267,6 @@ static netdev_tx_t cosa_net_tx(struct sk_buff *skb, struct net_device *d); static char *cosa_net_setup_rx(struct channel_data *channel, int size); static int cosa_net_rx_done(struct channel_data *channel); static int cosa_net_tx_done(struct channel_data *channel, int size); -static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); /* Character device */ static char *chrdev_setup_rx(struct channel_data *channel, int size); @@ -415,7 +414,7 @@ static const struct net_device_ops cosa_ops = { .ndo_open = cosa_net_open, .ndo_stop = cosa_net_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = cosa_net_ioctl, + .ndo_do_ioctl = hdlc_ioctl, .ndo_tx_timeout = cosa_net_timeout, }; @@ -1169,18 +1168,6 @@ static int cosa_ioctl_common(struct cosa_data *cosa, return -ENOIOCTLCMD; } -static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) -{ - int rv; - struct channel_data *chan = dev_to_chan(dev); - - rv = cosa_ioctl_common(chan->cosa, chan, cmd, - (unsigned long)ifr->ifr_data); - if (rv != -ENOIOCTLCMD) - return rv; - return hdlc_ioctl(dev, ifr, cmd); -} - static long cosa_chardev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) {