From patchwork Fri Jun 24 19:05:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Jungclaus X-Patchwork-Id: 12895016 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02ABBC433EF for ; Fri, 24 Jun 2022 19:05:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232113AbiFXTFw (ORCPT ); Fri, 24 Jun 2022 15:05:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229731AbiFXTFw (ORCPT ); Fri, 24 Jun 2022 15:05:52 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2113.outbound.protection.outlook.com [40.107.20.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB37781C7A; Fri, 24 Jun 2022 12:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G3HC9qOc+MRS3YhPvdtSlFBlh+JUoOiByp/KsCskw+N8ILwWocvN4hhjupbhzLQJhjDG2gBCcovlmltSjT18QxneRYCv/qKI7wtAT9z6qq/wGxmmAtdIeJyMyixGNaedZIXADCDaPLtLLpeOjbIAJzzyC3m+/oyrdmk5e27YVLLWDhtmQCXxfsozjGRhtsXPf6B5jbCTlmprQ/jXlOy1xNzB5JbRi3oBvKdfahM/95tI24rlaf9NVVQE9/O3nYHkZVFjsEHExV3T+nRY/D4aP34HUyGu/RJsUhfUvwSrtcpNHXcu36skC7TksuTpWs+LkNZ1T6N4j2Y7fQAw25lJtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EYGGqdFT08GLVLbRwtArHUMEUhhoDoD7rGyzTCLggoY=; b=JePP4rMZ6lLvHY7VBQD6b72cLcqd766OzfJ1iaeypkGqF6X9cbqpF1WIwdCXUrvsTBqiXqFvJ8oEmkXhyjz415NP2cJpPAFhH9fH/3WTd1rlf2udCF/Z0eIAprOjuUmvdgtJmUNc1Uts0ybgyEBDpHgbvuuMvRbRYZgAq2aIG4xiR6YszSJIjO5OM5qQjpTs1UJmA76T5Yd5v9wiNZGjNeFiyqmvF7r4/MkkDrJVUY2QENfm14l3JApzz/fC/yiHTvzDMOg6un72KA7l+EtXT+GIP2B+enRlkDMrGP/9gNCeas2VqfF7AS4W2V7YF6sQ9wzLOsZ0Z9LWiApKK6o2Ow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 217.86.141.140) smtp.rcpttodomain=esd.eu smtp.mailfrom=esd.eu; dmarc=bestguesspass action=none header.from=esd.eu; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=esdhannover.onmicrosoft.com; s=selector1-esdhannover-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EYGGqdFT08GLVLbRwtArHUMEUhhoDoD7rGyzTCLggoY=; b=SfOSOaTv8suy96YrtrsiYDb/N+LP8F6cGy9rK/uS6j5ekiCtF20qbm9UsxQxl2yPxzCN+qWfEs5B0qMlYINgBBYDZQ3+2KIpL/DGv7Qdh1DCFqhohmrcIss7SO+57BircCu2Q911CUO3jO6blllGLAswkj2l6JAdl1LA+MpijIU= Received: from AS8P250CA0009.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::14) by AS8PR03MB8665.eurprd03.prod.outlook.com (2603:10a6:20b:54b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Fri, 24 Jun 2022 19:05:48 +0000 Received: from VI1EUR06FT049.eop-eur06.prod.protection.outlook.com (2603:10a6:20b:330:cafe::e3) by AS8P250CA0009.outlook.office365.com (2603:10a6:20b:330::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17 via Frontend Transport; Fri, 24 Jun 2022 19:05:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 217.86.141.140) smtp.mailfrom=esd.eu; dkim=none (message not signed) header.d=none;dmarc=bestguesspass action=none header.from=esd.eu; Received-SPF: Pass (protection.outlook.com: domain of esd.eu designates 217.86.141.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.86.141.140; helo=esd-s7.esd; pr=C Received: from esd-s7.esd (217.86.141.140) by VI1EUR06FT049.mail.protection.outlook.com (10.13.6.72) with Microsoft SMTP Server id 15.20.5373.15 via Frontend Transport; Fri, 24 Jun 2022 19:05:47 +0000 Received: from esd-s20.esd.local (debby [10.0.0.190]) by esd-s7.esd (Postfix) with ESMTPS id 613B67C16C5; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) Received: by esd-s20.esd.local (Postfix, from userid 2046) id 56C6C2E4AF0; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) From: Frank Jungclaus To: linux-can@vger.kernel.org, Marc Kleine-Budde , Wolfgang Grandegger , Vincent Mailhol Cc: =?utf-8?q?Stefan_M=C3=A4tje?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frank Jungclaus Subject: [PATCH 1/5] can/esd_usb2: Rename esd_usb2.c to esd_usb.c Date: Fri, 24 Jun 2022 21:05:15 +0200 Message-Id: <20220624190517.2299701-2-frank.jungclaus@esd.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220624190517.2299701-1-frank.jungclaus@esd.eu> References: <20220624190517.2299701-1-frank.jungclaus@esd.eu> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1cbde8bc-d1da-4611-df30-08da56148c31 X-MS-TrafficTypeDiagnostic: AS8PR03MB8665:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PJxWDWkZR5bztrH3q5JuQFT1ifUc8i/mdph5aTyVZSwGPdTeULQFX0UktykN6CO9WxS/hzqizrsTlTixVPkN0RkqTPGF13qyQWvbwKzwfrehuRS6KTV3htZAG8WRvhqsZTbBtvMww8P+n8D+8vwEaMyjO2PEs++XffdfXCdb+9M7rR6V4K8ZYRMh+2V1Dx8tbjDebLjVRZndGehy/zfG7fKxqCZBVXuS0y/tEsTj4kU0Rs3uYCXRxurpd4FtEn4OcX3Uqlriw7ui3KgSzxn8xKsauYyGRQIjb7MPFviLfP2aNL2FDi0D1jd/qfG4f9ZOGrE5QyGR7JZ6SHEiTrt22OKo+EXRUwa2UO9TDzw92XFcxulMI8Bv4oLJ5dK84Uq1Fc5n7Cc4ok5aFTO87geGNVxtji8XRF+T2+ycduuf1vUZIeeGshcew7tNa6eSj1PWFAqxIThP8d7G9cvO3h69x1lSnoX3KUhopEE2EGUTxcBL4N177qgro5wNLZUjGqXw3qVIGr2ac5DlHPLePCKvcAKXk8xS8FJvPSkYJ1mWHTsDOh3nk/uYUtnz8R93MN6gWQwF45N6MVs7bxw2vFOEa4Z8mVYoNfbRv5xOpwy3F1O61tbMJpA7tdK/4t8a6jwIDM/lJzSkwR9YPquHu00nDOk4+awbBCnpDz0PVWt5WLJnoIhE/kjy++7ZTdFt9X7SkSLGJoOcAnnGFk7CztRTsphjcjG+fgStCs+Dvdk4ySls9Wkqc3O7UM7kScviYFCWmeLxRXvthM0XpJ+fkq3JLT/scMVMXu63TqZMXhHWdLk= X-Forefront-Antispam-Report: CIP:217.86.141.140;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:esd-s7.esd;PTR:pd9568d8c.dip0.t-ipconnect.de;CAT:NONE;SFS:(13230016)(4636009)(39830400003)(136003)(346002)(396003)(376002)(36840700001)(46966006)(8676002)(6666004)(40480700001)(5660300002)(4326008)(82310400005)(44832011)(86362001)(70586007)(356005)(70206006)(316002)(478600001)(1076003)(2616005)(2906002)(110136005)(8936002)(336012)(47076005)(42186006)(54906003)(186003)(36860700001)(36756003)(6266002)(81166007)(83380400001)(26005)(41300700001);DIR:OUT;SFP:1102; X-OriginatorOrg: esd.eu X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 19:05:47.6822 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1cbde8bc-d1da-4611-df30-08da56148c31 X-MS-Exchange-CrossTenant-Id: 5a9c3a1d-52db-4235-b74c-9fd851db2e6b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5a9c3a1d-52db-4235-b74c-9fd851db2e6b;Ip=[217.86.141.140];Helo=[esd-s7.esd] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT049.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB8665 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org As suggested by Vincent, renaming of esd_usb2.c to esd_usb.c and according to that, adaption of Kconfig and Makfile, too. Signed-off-by: Frank Jungclaus --- drivers/net/can/usb/Kconfig | 15 +++++++++++---- drivers/net/can/usb/Makefile | 2 +- drivers/net/can/usb/{esd_usb2.c => esd_usb.c} | 0 3 files changed, 12 insertions(+), 5 deletions(-) rename drivers/net/can/usb/{esd_usb2.c => esd_usb.c} (100%) diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig index f959215c9d53..1218f9642f33 100644 --- a/drivers/net/can/usb/Kconfig +++ b/drivers/net/can/usb/Kconfig @@ -14,11 +14,18 @@ config CAN_EMS_USB This driver is for the one channel CPC-USB/ARM7 CAN/USB interface from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de). -config CAN_ESD_USB2 - tristate "ESD USB/2 CAN/USB interface" +config CAN_ESD_USB + tristate "esd electronics gmbh CAN/USB interfaces" help - This driver supports the CAN-USB/2 interface - from esd electronic system design gmbh (http://www.esd.eu). + This driver adds supports for several CAN/USB interfaces + from esd electronics gmbh (https://www.esd.eu). + + The drivers supports the following devices: + - esd CAN-USB/2 + - esd CAN-USB/Micro + + To compile this driver as a module, choose M here: the module + will be called esd_usb. config CAN_ETAS_ES58X tristate "ETAS ES58X CAN/USB interfaces" diff --git a/drivers/net/can/usb/Makefile b/drivers/net/can/usb/Makefile index 748cf31a0d53..1ea16be5743b 100644 --- a/drivers/net/can/usb/Makefile +++ b/drivers/net/can/usb/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_CAN_8DEV_USB) += usb_8dev.o obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o -obj-$(CONFIG_CAN_ESD_USB2) += esd_usb2.o +obj-$(CONFIG_CAN_ESD_USB) += esd_usb.o obj-$(CONFIG_CAN_ETAS_ES58X) += etas_es58x/ obj-$(CONFIG_CAN_GS_USB) += gs_usb.o obj-$(CONFIG_CAN_KVASER_USB) += kvaser_usb/ diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb.c similarity index 100% rename from drivers/net/can/usb/esd_usb2.c rename to drivers/net/can/usb/esd_usb.c From patchwork Fri Jun 24 19:05:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Jungclaus X-Patchwork-Id: 12895017 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFB9CCCA482 for ; Fri, 24 Jun 2022 19:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232160AbiFXTF4 (ORCPT ); Fri, 24 Jun 2022 15:05:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229784AbiFXTFw (ORCPT ); Fri, 24 Jun 2022 15:05:52 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2097.outbound.protection.outlook.com [40.107.104.97]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E817481D83; Fri, 24 Jun 2022 12:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YSn+DE861UqweXl4wIGRR65lxGEOJAvWIjWyRWxCyITrDM2qul/gSULDyYzVN4TGiyiqrw4M/Xi3iWGDzEsY2JigzeLAqsA+FB6iba2O64SrMIQSV1lvfDTZAHn60qpFnsQHMSm1U2hpKCkxSIU5+Qa1ri+bgtdFBEGOK/V7EKRfpoX8Twpu3LIcIWDIYRzAtvW3R47FVJohFfkbuskQdDsRG2n7gJE4JU0Wh+3b5coE76OUVj6tVAClyxm9dB+jLB4JOXp3ZsQeiftyoSd1O6witBsyCTCc2sBw8aZpcCrWZTSltKmI1gvdD7k+OcYBUbCAh72LbKO1pj9njx+G2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+g6k4AcPdTLMCJZLEiV8LuZCvnfNx+meEMW0q+gqRRU=; b=Ytw7j2h7fAdfaayIHSIHZJ2g/uDI1hI+/z1fA5kfOREVE/uVtrUZqfbeq92U2vJJmyToj4G68IuM3M9IWmKELEq+lMOhVp3T42kpDNF5aTY0UQ0/GaJU1v/nnSuNmY4r6EoNWuQvJBuUp8OPkdv6trCwj59bnWMNpabzghTII/ETKQBy/x++icpJaTEpI6NOd3wqqB8ETDmo6bwM9h2KPyQbwTI2XtQ/7L9fcuGn34lbJNtfTaVRPJhDy8vKV6sZSsL38DEfKxNfQomrRB+GWOi2T770mEzCBCGAfHjRM71eh+f/zbXL7tLQJApB5AbOFI9jrTozCzt5uxn8m6a62g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 217.86.141.140) smtp.rcpttodomain=esd.eu smtp.mailfrom=esd.eu; dmarc=bestguesspass action=none header.from=esd.eu; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=esdhannover.onmicrosoft.com; s=selector1-esdhannover-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+g6k4AcPdTLMCJZLEiV8LuZCvnfNx+meEMW0q+gqRRU=; b=riaM5Aw8tfRePG8+0z6WFqFYSxRPcSlJRc/PNK6YrV6DF1b6VaoqK7olJDsVf5XDg2DUUl9l5qcGc7F6NNxkI+87ocorBWsBzZyhM/ZJl6LBLOAw4udA6V5cAfeu7ZkxOhYPFaM8AybhyW1j5z84zmHlwNLO5LCE/zgvQknJfr0= Received: from AM6P194CA0046.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::23) by DB9PR03MB7642.eurprd03.prod.outlook.com (2603:10a6:10:2be::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17; Fri, 24 Jun 2022 19:05:48 +0000 Received: from VI1EUR06FT010.eop-eur06.prod.protection.outlook.com (2603:10a6:209:84:cafe::44) by AM6P194CA0046.outlook.office365.com (2603:10a6:209:84::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15 via Frontend Transport; Fri, 24 Jun 2022 19:05:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 217.86.141.140) smtp.mailfrom=esd.eu; dkim=none (message not signed) header.d=none;dmarc=bestguesspass action=none header.from=esd.eu; Received-SPF: Pass (protection.outlook.com: domain of esd.eu designates 217.86.141.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.86.141.140; helo=esd-s7.esd; pr=C Received: from esd-s7.esd (217.86.141.140) by VI1EUR06FT010.mail.protection.outlook.com (10.13.6.179) with Microsoft SMTP Server id 15.20.5373.15 via Frontend Transport; Fri, 24 Jun 2022 19:05:47 +0000 Received: from esd-s20.esd.local (debby [10.0.0.190]) by esd-s7.esd (Postfix) with ESMTPS id 6A6867C16C8; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) Received: by esd-s20.esd.local (Postfix, from userid 2046) id 5A2882E4AF1; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) From: Frank Jungclaus To: linux-can@vger.kernel.org, Marc Kleine-Budde , Wolfgang Grandegger , Vincent Mailhol Cc: =?utf-8?q?Stefan_M=C3=A4tje?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frank Jungclaus Subject: [PATCH 2/5] can/esd_usb: Add an entry to the MAINTAINERS file Date: Fri, 24 Jun 2022 21:05:16 +0200 Message-Id: <20220624190517.2299701-3-frank.jungclaus@esd.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220624190517.2299701-1-frank.jungclaus@esd.eu> References: <20220624190517.2299701-1-frank.jungclaus@esd.eu> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 326cc9b3-eed8-4387-36bc-08da56148c27 X-MS-TrafficTypeDiagnostic: DB9PR03MB7642:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H1UwmGjOH3Qq+BLPmvWnb6AQW1isdFXnEqTkzOSsTyp0mzqsH0eSkj7YqwqECpwm47xwsDtjxqPH5y0nZLjzuaQL5c0d4IQozP96WmT6j0mfu/swuCXSfcupWQFHZIH+yuMKejAzcRfGGvEMxDlyArewtWmpJkG6hzBqBl3rX52AW/nixPbXY283GyIGkYCd2YPuUZbQ4c2mHa2w1pWNbtSCu0C3gRxY25KEN3pTXBj+q4D4fbkwmZHlrHmAqMEDBvBO9ss8c6LPqlKtlb/URqNigo5pvieWGl6GD567YZGiM1OQ8AZeRKaM31WNcB7o1nPOmCsLI+4rTm5nNwBsdTnSHLnbxyv/nNpTLYNmMe2EOKpxPO0TRb9RRdgJLTY5Y+KVcLY/L+GGlhp060tJvA+l25d0TEnCPpv7w4pR0V9zxS/T4xDFw2iOyZVEZR7sMZ1F1MK/XUwLxF4ssDms5coUqjhgIpVMAoFa3XbZ3E0wmprxtFxIIq2R6DgyRxC0rWBmd9hVO91TPbyQFzgNNm9jWkh6zbpMF9da4Gr+UrUmNVVxLI7LnIYYKbHzzOaLAsjGnAhWCmK8x/VJlYd5Yg7k6Wv9jYIt9KfoXW4rnGfmPCnnU85M5+wcWU2v+ouDUlTFp2vhIOPmNQNVGaC91kT7MWG9T5yBV18BGcY5i3USdmpa4x0dVi6zfXtCm86YtBPR5lURlcOUyGkkNvByWEqEYseC1FQdwXPV0wwfZLjtz1zdKQsE64+/URE7UctVE8wHyuXRZwd26zgX5n16pg== X-Forefront-Antispam-Report: CIP:217.86.141.140;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:esd-s7.esd;PTR:pd9568d8c.dip0.t-ipconnect.de;CAT:NONE;SFS:(13230016)(4636009)(39830400003)(136003)(346002)(396003)(376002)(36840700001)(46966006)(26005)(110136005)(1076003)(5660300002)(2906002)(47076005)(186003)(81166007)(6266002)(41300700001)(2616005)(4744005)(4326008)(42186006)(316002)(6666004)(8676002)(70586007)(54906003)(70206006)(44832011)(8936002)(40480700001)(36860700001)(36756003)(356005)(336012)(478600001)(86362001)(82310400005);DIR:OUT;SFP:1102; X-OriginatorOrg: esd.eu X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 19:05:47.6123 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 326cc9b3-eed8-4387-36bc-08da56148c27 X-MS-Exchange-CrossTenant-Id: 5a9c3a1d-52db-4235-b74c-9fd851db2e6b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5a9c3a1d-52db-4235-b74c-9fd851db2e6b;Ip=[217.86.141.140];Helo=[esd-s7.esd] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT010.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR03MB7642 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As suggested by Marc, I added an entry for ESD CAN/USB Drivers to the MAINTAINERS file Signed-off-by: Frank Jungclaus --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 05fcbea3e432..2d1cf1718140 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7406,6 +7406,13 @@ S: Maintained F: include/linux/errseq.h F: lib/errseq.c +ESD CAN/USB DRIVERS +M: Frank Jungclaus +R: socketcan@esd.eu +L: linux-can@vger.kernel.org +S: Maintained +F: drivers/net/can/usb/esd_usb.c + ET131X NETWORK DRIVER M: Mark Einon S: Odd Fixes From patchwork Fri Jun 24 19:05:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Jungclaus X-Patchwork-Id: 12895018 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79F22CCA483 for ; Fri, 24 Jun 2022 19:05:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232210AbiFXTFy (ORCPT ); Fri, 24 Jun 2022 15:05:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230224AbiFXTFw (ORCPT ); Fri, 24 Jun 2022 15:05:52 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60138.outbound.protection.outlook.com [40.107.6.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66BF681C7D; Fri, 24 Jun 2022 12:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R8g4GT4rSp6zXSsO39UMhXYl9ZFmHO58SuicgQDYPEKBkgPYzlh+AsU0rvKHEcvUmmU2vWNoY8fw6JIHVhnvAyYB/aeWnrlVNRFV2pYW44uNsbY2W2Hwwmy9OkwPzOd50fezCU7GBZ837VecBpcDqY0LgrrZcSAMP7k+LQkqbPmrCic7BfIE+s6NZTzQNdHuKKaQhI9uFRu19CkRe/olnxiFLjU5BDmTXMQ7OjZhCj2hqvlkFFnxufciTY40mok5b48E0lKnqkTv0XAr/mZw+3LVLshbgGvKWONi1OpSkyqSG9uBBxqdi3rg2JVkrOnrln4hcUuOUrDTbKguImUMQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xfsZQPlQMMnL3xQIpBUSnijf9LBSjT0S9SHItKLu6Zk=; b=kgneighDXQaKGocLJM1o93x952H92XRPSUoG0rRMC0jD7EGSHntgVNc4QJYNWzyCrtfNFyZgl/4xdh8NnBKNXhC1k+sPzxHLnmKVC5D6s5/Cy8Pbsd4c478gCVaev9bW5kUgXB+E34sR39Aqf+kld/AT5GfCe5rutn2ufzYmUuITQNiIqOCK5Gez5ksoEretS13cLT+OuMWEdujuJ0KQ6DwgNWJPCbiC9pBakRUmECTqxdLLfTWbbQBtjD5MJ/R2bildkA+0hArSGOK4EshW0dFTkEtuz55SQS8uBr4azI6t5di6TogYnlTv/qMYZw9mxGS0qWj+qsAp+8hnJBXJoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 217.86.141.140) smtp.rcpttodomain=esd.eu smtp.mailfrom=esd.eu; dmarc=bestguesspass action=none header.from=esd.eu; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=esdhannover.onmicrosoft.com; s=selector1-esdhannover-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xfsZQPlQMMnL3xQIpBUSnijf9LBSjT0S9SHItKLu6Zk=; b=IE12yJNTZILvvhJdId3NE1P6DyQmEQ21GvBbCGmBHHY5NrM+oXsF9BdE/kVfv0AfAjFTzTKhEEODJH77ETi3O0AHcSq5Te7yxtV/NEVINI8JPb72NjcQZhZ/7BDLfZfvMRvAOcsXdVdy6yencH5FZP/2wAzUqh4JtcNJTFx6ObQ= Received: from AS9PR0301CA0057.eurprd03.prod.outlook.com (2603:10a6:20b:469::11) by AM6PR03MB4405.eurprd03.prod.outlook.com (2603:10a6:20b:f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17; Fri, 24 Jun 2022 19:05:48 +0000 Received: from VI1EUR06FT057.eop-eur06.prod.protection.outlook.com (2603:10a6:20b:469:cafe::9) by AS9PR0301CA0057.outlook.office365.com (2603:10a6:20b:469::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17 via Frontend Transport; Fri, 24 Jun 2022 19:05:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 217.86.141.140) smtp.mailfrom=esd.eu; dkim=none (message not signed) header.d=none;dmarc=bestguesspass action=none header.from=esd.eu; Received-SPF: Pass (protection.outlook.com: domain of esd.eu designates 217.86.141.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.86.141.140; helo=esd-s7.esd; pr=C Received: from esd-s7.esd (217.86.141.140) by VI1EUR06FT057.mail.protection.outlook.com (10.13.6.165) with Microsoft SMTP Server id 15.20.5373.15 via Frontend Transport; Fri, 24 Jun 2022 19:05:47 +0000 Received: from esd-s20.esd.local (debby [10.0.0.190]) by esd-s7.esd (Postfix) with ESMTPS id 776237C16C9; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) Received: by esd-s20.esd.local (Postfix, from userid 2046) id 5D7642E4AF2; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) From: Frank Jungclaus To: linux-can@vger.kernel.org, Marc Kleine-Budde , Wolfgang Grandegger , Vincent Mailhol Cc: =?utf-8?q?Stefan_M=C3=A4tje?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frank Jungclaus Subject: [PATCH 3/5] can/esd_usb: Rename all terms USB2 to USB Date: Fri, 24 Jun 2022 21:05:17 +0200 Message-Id: <20220624190517.2299701-4-frank.jungclaus@esd.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220624190517.2299701-1-frank.jungclaus@esd.eu> References: <20220624190517.2299701-1-frank.jungclaus@esd.eu> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba616682-f64e-4530-53f5-08da56148c2d X-MS-TrafficTypeDiagnostic: AM6PR03MB4405:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NlKj0Co4Iu5WMzlK/NBmcvyT3+3VtwNZ9/x7o8uvHAGUOHo9Cq1NWXAoGrUVetl75jMouKgjFCZ0Efx350yFCaAURNDm+21ZBuaxOHmu//KTu35nMoPSotYIsWY38Ls+aHMN9wnULFHtBY/C/Je7z5xmX5GIxvDvbsRNAULqd/aGzmdnlqeZN+9xkHd/yzsxipaDMx8ASVD59kkUiktGD0eUkq6bfrCyvBndYOUQIAmoFH35HKgXqIaSCew3pHEwKylTVw2lxXKdQEKwAwEaXd6yR0U0Shy6NQ6cxLOCWLAb7Cthhm2Os+1k1PooWHVbElLjIYw9MCTrbSUSvtiUxIdhreceMkS87N38Qj8JOuSu18xR7L8LfWUs1s+Uk8fdIF4wGWraZJJmzplx+yanX74ltQ0U+AC4HiB1kxAdmupk3NPHvKgan+nYN2Y86MnqXeDxVQ9UKpgyexOuUHTYo/cylkGsV+/Vng9kq6bKotzLmGo9WsE6ceMnJBxpfuSPkB/lvte5RWMZTHhktYq+9s0PZbPmze4Th2QeToTnZdh6Bp8gwn9j5q+ScKlGLAiG/318McJ3abGMWeMcmlPf4o8iRU3hvMljeWzD+hJCQIRJTF1QPQOnX54QLVtE0S+08bR6mWzxwwCjHiH3DlSV+YgilDVloYYKqnmLHCOAATJ+EaakthEHDBNbWGX5DNqfX3iZHQQ3DnwG2lIGBO9STETC/qQeh7Z3d86daETpyu2Be5lJDiT6Amimu//0drceJSveMeRTrlGl5VAww69/Hg== X-Forefront-Antispam-Report: CIP:217.86.141.140;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:esd-s7.esd;PTR:pd9568d8c.dip0.t-ipconnect.de;CAT:NONE;SFS:(13230016)(4636009)(346002)(396003)(136003)(39830400003)(376002)(36840700001)(46966006)(30864003)(5660300002)(44832011)(316002)(42186006)(54906003)(70206006)(82310400005)(8676002)(83380400001)(4326008)(40480700001)(110136005)(8936002)(2906002)(478600001)(70586007)(36860700001)(36756003)(47076005)(26005)(6266002)(6666004)(41300700001)(1076003)(86362001)(336012)(81166007)(186003)(2616005)(356005);DIR:OUT;SFP:1102; X-OriginatorOrg: esd.eu X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 19:05:47.6524 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba616682-f64e-4530-53f5-08da56148c2d X-MS-Exchange-CrossTenant-Id: 5a9c3a1d-52db-4235-b74c-9fd851db2e6b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5a9c3a1d-52db-4235-b74c-9fd851db2e6b;Ip=[217.86.141.140];Helo=[esd-s7.esd] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT057.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4405 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Each occurrence of the term "usb2" within variables, function names, comments, etc. is changed to "usb" where it is shared for all esd CAN/USB devices. Signed-off-by: Frank Jungclaus --- drivers/net/can/usb/esd_usb.c | 213 +++++++++++++++++----------------- 1 file changed, 109 insertions(+), 104 deletions(-) diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c index 286daaaea0b8..befd570018d7 100644 --- a/drivers/net/can/usb/esd_usb.c +++ b/drivers/net/can/usb/esd_usb.c @@ -18,16 +18,19 @@ MODULE_AUTHOR("Matthias Fuchs "); MODULE_DESCRIPTION("CAN driver for esd CAN-USB/2 and CAN-USB/Micro interfaces"); MODULE_LICENSE("GPL v2"); -/* Define these values to match your devices */ +/* USB vendor and product ID */ #define USB_ESDGMBH_VENDOR_ID 0x0ab4 #define USB_CANUSB2_PRODUCT_ID 0x0010 #define USB_CANUSBM_PRODUCT_ID 0x0011 +/* CAN controller clock frequencies */ #define ESD_USB2_CAN_CLOCK 60000000 #define ESD_USBM_CAN_CLOCK 36000000 -#define ESD_USB2_MAX_NETS 2 -/* USB2 commands */ +/* Maximum number of CAN nets */ +#define ESD_USB_MAX_NETS 2 + +/* USB commands */ #define CMD_VERSION 1 /* also used for VERSION_REPLY */ #define CMD_CAN_RX 2 /* device to host only */ #define CMD_CAN_TX 3 /* also used for TX_DONE */ @@ -43,13 +46,15 @@ MODULE_LICENSE("GPL v2"); #define ESD_EVENT 0x40000000 #define ESD_IDMASK 0x1fffffff -/* esd CAN event ids used by this driver */ -#define ESD_EV_CAN_ERROR_EXT 2 +/* esd CAN event ids */ +#define ESD_EV_CAN_ERROR_EXT 2 /* CAN controller specific diagnostic data */ /* baudrate message flags */ -#define ESD_USB2_UBR 0x80000000 -#define ESD_USB2_LOM 0x40000000 -#define ESD_USB2_NO_BAUDRATE 0x7fffffff +#define ESD_USB_UBR 0x80000000 +#define ESD_USB_LOM 0x40000000 +#define ESD_USB_NO_BAUDRATE 0x7fffffff + +/* bit timing CAN-USB/2 */ #define ESD_USB2_TSEG1_MIN 1 #define ESD_USB2_TSEG1_MAX 16 #define ESD_USB2_TSEG1_SHIFT 16 @@ -68,7 +73,7 @@ MODULE_LICENSE("GPL v2"); #define ESD_ID_ENABLE 0x80 #define ESD_MAX_ID_SEGMENT 64 -/* SJA1000 ECC register (emulated by usb2 firmware) */ +/* SJA1000 ECC register (emulated by usb firmware) */ #define SJA1000_ECC_SEG 0x1F #define SJA1000_ECC_DIR 0x20 #define SJA1000_ECC_ERR 0x06 @@ -158,7 +163,7 @@ struct set_baudrate_msg { }; /* Main message type used between library and application */ -struct __attribute__ ((packed)) esd_usb2_msg { +struct __attribute__ ((packed)) esd_usb_msg { union { struct header_msg hdr; struct version_msg version; @@ -171,23 +176,23 @@ struct __attribute__ ((packed)) esd_usb2_msg { } msg; }; -static struct usb_device_id esd_usb2_table[] = { +static struct usb_device_id esd_usb_table[] = { {USB_DEVICE(USB_ESDGMBH_VENDOR_ID, USB_CANUSB2_PRODUCT_ID)}, {USB_DEVICE(USB_ESDGMBH_VENDOR_ID, USB_CANUSBM_PRODUCT_ID)}, {} }; -MODULE_DEVICE_TABLE(usb, esd_usb2_table); +MODULE_DEVICE_TABLE(usb, esd_usb_table); -struct esd_usb2_net_priv; +struct esd_usb_net_priv; struct esd_tx_urb_context { - struct esd_usb2_net_priv *priv; + struct esd_usb_net_priv *priv; u32 echo_index; }; -struct esd_usb2 { +struct esd_usb { struct usb_device *udev; - struct esd_usb2_net_priv *nets[ESD_USB2_MAX_NETS]; + struct esd_usb_net_priv *nets[ESD_USB_MAX_NETS]; struct usb_anchor rx_submitted; @@ -198,22 +203,22 @@ struct esd_usb2 { dma_addr_t rxbuf_dma[MAX_RX_URBS]; }; -struct esd_usb2_net_priv { +struct esd_usb_net_priv { struct can_priv can; /* must be the first member */ atomic_t active_tx_jobs; struct usb_anchor tx_submitted; struct esd_tx_urb_context tx_contexts[MAX_TX_URBS]; - struct esd_usb2 *usb2; + struct esd_usb *usb; struct net_device *netdev; int index; u8 old_state; struct can_berr_counter bec; }; -static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, - struct esd_usb2_msg *msg) +static void esd_usb_rx_event(struct esd_usb_net_priv *priv, + struct esd_usb_msg *msg) { struct net_device_stats *stats = &priv->netdev->stats; struct can_frame *cf; @@ -296,8 +301,8 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, } } -static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv, - struct esd_usb2_msg *msg) +static void esd_usb_rx_can_msg(struct esd_usb_net_priv *priv, + struct esd_usb_msg *msg) { struct net_device_stats *stats = &priv->netdev->stats; struct can_frame *cf; @@ -311,7 +316,7 @@ static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv, id = le32_to_cpu(msg->msg.rx.id); if (id & ESD_EVENT) { - esd_usb2_rx_event(priv, msg); + esd_usb_rx_event(priv, msg); } else { skb = alloc_can_skb(priv->netdev, &cf); if (skb == NULL) { @@ -342,8 +347,8 @@ static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv, return; } -static void esd_usb2_tx_done_msg(struct esd_usb2_net_priv *priv, - struct esd_usb2_msg *msg) +static void esd_usb_tx_done_msg(struct esd_usb_net_priv *priv, + struct esd_usb_msg *msg) { struct net_device_stats *stats = &priv->netdev->stats; struct net_device *netdev = priv->netdev; @@ -370,9 +375,9 @@ static void esd_usb2_tx_done_msg(struct esd_usb2_net_priv *priv, netif_wake_queue(netdev); } -static void esd_usb2_read_bulk_callback(struct urb *urb) +static void esd_usb_read_bulk_callback(struct urb *urb) { - struct esd_usb2 *dev = urb->context; + struct esd_usb *dev = urb->context; int retval; int pos = 0; int i; @@ -394,9 +399,9 @@ static void esd_usb2_read_bulk_callback(struct urb *urb) } while (pos < urb->actual_length) { - struct esd_usb2_msg *msg; + struct esd_usb_msg *msg; - msg = (struct esd_usb2_msg *)(urb->transfer_buffer + pos); + msg = (struct esd_usb_msg *)(urb->transfer_buffer + pos); switch (msg->msg.hdr.cmd) { case CMD_CAN_RX: @@ -405,7 +410,7 @@ static void esd_usb2_read_bulk_callback(struct urb *urb) break; } - esd_usb2_rx_can_msg(dev->nets[msg->msg.rx.net], msg); + esd_usb_rx_can_msg(dev->nets[msg->msg.rx.net], msg); break; case CMD_CAN_TX: @@ -414,8 +419,8 @@ static void esd_usb2_read_bulk_callback(struct urb *urb) break; } - esd_usb2_tx_done_msg(dev->nets[msg->msg.txdone.net], - msg); + esd_usb_tx_done_msg(dev->nets[msg->msg.txdone.net], + msg); break; } @@ -430,7 +435,7 @@ static void esd_usb2_read_bulk_callback(struct urb *urb) resubmit_urb: usb_fill_bulk_urb(urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1), urb->transfer_buffer, RX_BUFFER_SIZE, - esd_usb2_read_bulk_callback, dev); + esd_usb_read_bulk_callback, dev); retval = usb_submit_urb(urb, GFP_ATOMIC); if (retval == -ENODEV) { @@ -449,12 +454,12 @@ static void esd_usb2_read_bulk_callback(struct urb *urb) /* * callback for bulk IN urb */ -static void esd_usb2_write_bulk_callback(struct urb *urb) +static void esd_usb_write_bulk_callback(struct urb *urb) { struct esd_tx_urb_context *context = urb->context; - struct esd_usb2_net_priv *priv; + struct esd_usb_net_priv *priv; struct net_device *netdev; - size_t size = sizeof(struct esd_usb2_msg); + size_t size = sizeof(struct esd_usb_msg); WARN_ON(!context); @@ -478,7 +483,7 @@ static ssize_t firmware_show(struct device *d, struct device_attribute *attr, char *buf) { struct usb_interface *intf = to_usb_interface(d); - struct esd_usb2 *dev = usb_get_intfdata(intf); + struct esd_usb *dev = usb_get_intfdata(intf); return sprintf(buf, "%d.%d.%d\n", (dev->version >> 12) & 0xf, @@ -491,7 +496,7 @@ static ssize_t hardware_show(struct device *d, struct device_attribute *attr, char *buf) { struct usb_interface *intf = to_usb_interface(d); - struct esd_usb2 *dev = usb_get_intfdata(intf); + struct esd_usb *dev = usb_get_intfdata(intf); return sprintf(buf, "%d.%d.%d\n", (dev->version >> 28) & 0xf, @@ -504,13 +509,13 @@ static ssize_t nets_show(struct device *d, struct device_attribute *attr, char *buf) { struct usb_interface *intf = to_usb_interface(d); - struct esd_usb2 *dev = usb_get_intfdata(intf); + struct esd_usb *dev = usb_get_intfdata(intf); return sprintf(buf, "%d", dev->net_count); } static DEVICE_ATTR_RO(nets); -static int esd_usb2_send_msg(struct esd_usb2 *dev, struct esd_usb2_msg *msg) +static int esd_usb_send_msg(struct esd_usb *dev, struct esd_usb_msg *msg) { int actual_length; @@ -522,8 +527,8 @@ static int esd_usb2_send_msg(struct esd_usb2 *dev, struct esd_usb2_msg *msg) 1000); } -static int esd_usb2_wait_msg(struct esd_usb2 *dev, - struct esd_usb2_msg *msg) +static int esd_usb_wait_msg(struct esd_usb *dev, + struct esd_usb_msg *msg) { int actual_length; @@ -535,7 +540,7 @@ static int esd_usb2_wait_msg(struct esd_usb2 *dev, 1000); } -static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev) +static int esd_usb_setup_rx_urbs(struct esd_usb *dev) { int i, err = 0; @@ -568,7 +573,7 @@ static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev) usb_fill_bulk_urb(urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1), buf, RX_BUFFER_SIZE, - esd_usb2_read_bulk_callback, dev); + esd_usb_read_bulk_callback, dev); urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; usb_anchor_urb(urb, &dev->rx_submitted); @@ -609,11 +614,11 @@ static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev) /* * Start interface */ -static int esd_usb2_start(struct esd_usb2_net_priv *priv) +static int esd_usb_start(struct esd_usb_net_priv *priv) { - struct esd_usb2 *dev = priv->usb2; + struct esd_usb *dev = priv->usb; struct net_device *netdev = priv->netdev; - struct esd_usb2_msg *msg; + struct esd_usb_msg *msg; int err, i; msg = kmalloc(sizeof(*msg), GFP_KERNEL); @@ -644,11 +649,11 @@ static int esd_usb2_start(struct esd_usb2_net_priv *priv) /* enable 29bit extended IDs */ msg->msg.filter.mask[ESD_MAX_ID_SEGMENT] = cpu_to_le32(0x00000001); - err = esd_usb2_send_msg(dev, msg); + err = esd_usb_send_msg(dev, msg); if (err) goto out; - err = esd_usb2_setup_rx_urbs(dev); + err = esd_usb_setup_rx_urbs(dev); if (err) goto out; @@ -664,9 +669,9 @@ static int esd_usb2_start(struct esd_usb2_net_priv *priv) return err; } -static void unlink_all_urbs(struct esd_usb2 *dev) +static void unlink_all_urbs(struct esd_usb *dev) { - struct esd_usb2_net_priv *priv; + struct esd_usb_net_priv *priv; int i, j; usb_kill_anchored_urbs(&dev->rx_submitted); @@ -687,9 +692,9 @@ static void unlink_all_urbs(struct esd_usb2 *dev) } } -static int esd_usb2_open(struct net_device *netdev) +static int esd_usb_open(struct net_device *netdev) { - struct esd_usb2_net_priv *priv = netdev_priv(netdev); + struct esd_usb_net_priv *priv = netdev_priv(netdev); int err; /* common open */ @@ -698,7 +703,7 @@ static int esd_usb2_open(struct net_device *netdev) return err; /* finally start device */ - err = esd_usb2_start(priv); + err = esd_usb_start(priv); if (err) { netdev_warn(netdev, "couldn't start device: %d\n", err); close_candev(netdev); @@ -710,20 +715,20 @@ static int esd_usb2_open(struct net_device *netdev) return 0; } -static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb, +static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb, struct net_device *netdev) { - struct esd_usb2_net_priv *priv = netdev_priv(netdev); - struct esd_usb2 *dev = priv->usb2; + struct esd_usb_net_priv *priv = netdev_priv(netdev); + struct esd_usb *dev = priv->usb; struct esd_tx_urb_context *context = NULL; struct net_device_stats *stats = &netdev->stats; struct can_frame *cf = (struct can_frame *)skb->data; - struct esd_usb2_msg *msg; + struct esd_usb_msg *msg; struct urb *urb; u8 *buf; int i, err; int ret = NETDEV_TX_OK; - size_t size = sizeof(struct esd_usb2_msg); + size_t size = sizeof(struct esd_usb_msg); if (can_dropped_invalid_skb(netdev, skb)) return NETDEV_TX_OK; @@ -745,7 +750,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb, goto nobufmem; } - msg = (struct esd_usb2_msg *)buf; + msg = (struct esd_usb_msg *)buf; msg->msg.hdr.len = 3; /* minimal length */ msg->msg.hdr.cmd = CMD_CAN_TX; @@ -788,7 +793,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb, usb_fill_bulk_urb(urb, dev->udev, usb_sndbulkpipe(dev->udev, 2), buf, msg->msg.hdr.len << 2, - esd_usb2_write_bulk_callback, context); + esd_usb_write_bulk_callback, context); urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; @@ -839,24 +844,24 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb, return ret; } -static int esd_usb2_close(struct net_device *netdev) +static int esd_usb_close(struct net_device *netdev) { - struct esd_usb2_net_priv *priv = netdev_priv(netdev); - struct esd_usb2_msg *msg; + struct esd_usb_net_priv *priv = netdev_priv(netdev); + struct esd_usb_msg *msg; int i; msg = kmalloc(sizeof(*msg), GFP_KERNEL); if (!msg) return -ENOMEM; - /* Disable all IDs (see esd_usb2_start()) */ + /* Disable all IDs (see esd_usb_start()) */ msg->msg.hdr.cmd = CMD_IDADD; msg->msg.hdr.len = 2 + ESD_MAX_ID_SEGMENT; msg->msg.filter.net = priv->index; msg->msg.filter.option = ESD_ID_ENABLE; /* start with segment 0 */ for (i = 0; i <= ESD_MAX_ID_SEGMENT; i++) msg->msg.filter.mask[i] = 0; - if (esd_usb2_send_msg(priv->usb2, msg) < 0) + if (esd_usb_send_msg(priv->usb, msg) < 0) netdev_err(netdev, "sending idadd message failed\n"); /* set CAN controller to reset mode */ @@ -864,8 +869,8 @@ static int esd_usb2_close(struct net_device *netdev) msg->msg.hdr.cmd = CMD_SETBAUD; msg->msg.setbaud.net = priv->index; msg->msg.setbaud.rsvd = 0; - msg->msg.setbaud.baud = cpu_to_le32(ESD_USB2_NO_BAUDRATE); - if (esd_usb2_send_msg(priv->usb2, msg) < 0) + msg->msg.setbaud.baud = cpu_to_le32(ESD_USB_NO_BAUDRATE); + if (esd_usb_send_msg(priv->usb, msg) < 0) netdev_err(netdev, "sending setbaud message failed\n"); priv->can.state = CAN_STATE_STOPPED; @@ -879,10 +884,10 @@ static int esd_usb2_close(struct net_device *netdev) return 0; } -static const struct net_device_ops esd_usb2_netdev_ops = { - .ndo_open = esd_usb2_open, - .ndo_stop = esd_usb2_close, - .ndo_start_xmit = esd_usb2_start_xmit, +static const struct net_device_ops esd_usb_netdev_ops = { + .ndo_open = esd_usb_open, + .ndo_stop = esd_usb_close, + .ndo_start_xmit = esd_usb_start_xmit, .ndo_change_mtu = can_change_mtu, }; @@ -900,20 +905,20 @@ static const struct can_bittiming_const esd_usb2_bittiming_const = { static int esd_usb2_set_bittiming(struct net_device *netdev) { - struct esd_usb2_net_priv *priv = netdev_priv(netdev); + struct esd_usb_net_priv *priv = netdev_priv(netdev); struct can_bittiming *bt = &priv->can.bittiming; - struct esd_usb2_msg *msg; + struct esd_usb_msg *msg; int err; u32 canbtr; int sjw_shift; - canbtr = ESD_USB2_UBR; + canbtr = ESD_USB_UBR; if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) - canbtr |= ESD_USB2_LOM; + canbtr |= ESD_USB_LOM; canbtr |= (bt->brp - 1) & (ESD_USB2_BRP_MAX - 1); - if (le16_to_cpu(priv->usb2->udev->descriptor.idProduct) == + if (le16_to_cpu(priv->usb->udev->descriptor.idProduct) == USB_CANUSBM_PRODUCT_ID) sjw_shift = ESD_USBM_SJW_SHIFT; else @@ -941,16 +946,16 @@ static int esd_usb2_set_bittiming(struct net_device *netdev) netdev_info(netdev, "setting BTR=%#x\n", canbtr); - err = esd_usb2_send_msg(priv->usb2, msg); + err = esd_usb_send_msg(priv->usb, msg); kfree(msg); return err; } -static int esd_usb2_get_berr_counter(const struct net_device *netdev, - struct can_berr_counter *bec) +static int esd_usb_get_berr_counter(const struct net_device *netdev, + struct can_berr_counter *bec) { - struct esd_usb2_net_priv *priv = netdev_priv(netdev); + struct esd_usb_net_priv *priv = netdev_priv(netdev); bec->txerr = priv->bec.txerr; bec->rxerr = priv->bec.rxerr; @@ -958,7 +963,7 @@ static int esd_usb2_get_berr_counter(const struct net_device *netdev, return 0; } -static int esd_usb2_set_mode(struct net_device *netdev, enum can_mode mode) +static int esd_usb_set_mode(struct net_device *netdev, enum can_mode mode) { switch (mode) { case CAN_MODE_START: @@ -972,11 +977,11 @@ static int esd_usb2_set_mode(struct net_device *netdev, enum can_mode mode) return 0; } -static int esd_usb2_probe_one_net(struct usb_interface *intf, int index) +static int esd_usb_probe_one_net(struct usb_interface *intf, int index) { - struct esd_usb2 *dev = usb_get_intfdata(intf); + struct esd_usb *dev = usb_get_intfdata(intf); struct net_device *netdev; - struct esd_usb2_net_priv *priv; + struct esd_usb_net_priv *priv; int err = 0; int i; @@ -995,7 +1000,7 @@ static int esd_usb2_probe_one_net(struct usb_interface *intf, int index) for (i = 0; i < MAX_TX_URBS; i++) priv->tx_contexts[i].echo_index = MAX_TX_URBS; - priv->usb2 = dev; + priv->usb = dev; priv->netdev = netdev; priv->index = index; @@ -1013,12 +1018,12 @@ static int esd_usb2_probe_one_net(struct usb_interface *intf, int index) priv->can.bittiming_const = &esd_usb2_bittiming_const; priv->can.do_set_bittiming = esd_usb2_set_bittiming; - priv->can.do_set_mode = esd_usb2_set_mode; - priv->can.do_get_berr_counter = esd_usb2_get_berr_counter; + priv->can.do_set_mode = esd_usb_set_mode; + priv->can.do_get_berr_counter = esd_usb_get_berr_counter; netdev->flags |= IFF_ECHO; /* we support local echo */ - netdev->netdev_ops = &esd_usb2_netdev_ops; + netdev->netdev_ops = &esd_usb_netdev_ops; SET_NETDEV_DEV(netdev, &intf->dev); netdev->dev_id = index; @@ -1039,16 +1044,16 @@ static int esd_usb2_probe_one_net(struct usb_interface *intf, int index) } /* - * probe function for new USB2 devices + * probe function for new USB devices * * check version information and number of available * CAN interfaces */ -static int esd_usb2_probe(struct usb_interface *intf, +static int esd_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) { - struct esd_usb2 *dev; - struct esd_usb2_msg *msg; + struct esd_usb *dev; + struct esd_usb_msg *msg; int i, err; dev = kzalloc(sizeof(*dev), GFP_KERNEL); @@ -1076,13 +1081,13 @@ static int esd_usb2_probe(struct usb_interface *intf, msg->msg.version.flags = 0; msg->msg.version.drv_version = 0; - err = esd_usb2_send_msg(dev, msg); + err = esd_usb_send_msg(dev, msg); if (err < 0) { dev_err(&intf->dev, "sending version message failed\n"); goto free_msg; } - err = esd_usb2_wait_msg(dev, msg); + err = esd_usb_wait_msg(dev, msg); if (err < 0) { dev_err(&intf->dev, "no version message answer\n"); goto free_msg; @@ -1105,7 +1110,7 @@ static int esd_usb2_probe(struct usb_interface *intf, /* do per device probing */ for (i = 0; i < dev->net_count; i++) - esd_usb2_probe_one_net(intf, i); + esd_usb_probe_one_net(intf, i); free_msg: kfree(msg); @@ -1118,9 +1123,9 @@ static int esd_usb2_probe(struct usb_interface *intf, /* * called by the usb core when the device is removed from the system */ -static void esd_usb2_disconnect(struct usb_interface *intf) +static void esd_usb_disconnect(struct usb_interface *intf) { - struct esd_usb2 *dev = usb_get_intfdata(intf); + struct esd_usb *dev = usb_get_intfdata(intf); struct net_device *netdev; int i; @@ -1144,11 +1149,11 @@ static void esd_usb2_disconnect(struct usb_interface *intf) } /* usb specific object needed to register this driver with the usb subsystem */ -static struct usb_driver esd_usb2_driver = { - .name = "esd_usb2", - .probe = esd_usb2_probe, - .disconnect = esd_usb2_disconnect, - .id_table = esd_usb2_table, +static struct usb_driver esd_usb_driver = { + .name = "esd_usb", + .probe = esd_usb_probe, + .disconnect = esd_usb_disconnect, + .id_table = esd_usb_table, }; -module_usb_driver(esd_usb2_driver); +module_usb_driver(esd_usb_driver); From patchwork Fri Jun 24 19:05:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Jungclaus X-Patchwork-Id: 12895020 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B3FACCA473 for ; Fri, 24 Jun 2022 19:06:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230239AbiFXTF7 (ORCPT ); Fri, 24 Jun 2022 15:05:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230380AbiFXTFw (ORCPT ); Fri, 24 Jun 2022 15:05:52 -0400 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80122.outbound.protection.outlook.com [40.107.8.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 153F181D84; Fri, 24 Jun 2022 12:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oVnEeGnRAhr5k9igcROSZG8wvuxr5b3EbkJ5OZEAAZbaySTFaJ+eIt4TpvQG8XpB4TVMsvh/1MZznfFQI/OoNIcmN8+NNjkR4JRWn5ri4zaxJdSLVMyxYWEQ3dNMcO+dBeSuDmTFepzBvOccUBzpz83jteIqGFU5CbRiDNMmRmHVW9GTn/JylZYTIpcZAT2ly6BbCelt6F6T3DECTj2j6gAwbiuQTe0HIHyV5aeoahvxazfD+QE52VFfvnMlmbtH485XVgUaIZyMW8Sp89YMZFvWWVNlTdNkaKZ0eOUnopTu7N6wceE++ny75pVc2kGaUwJN6rf6h+QRiEtfs/CxFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=phX3IWb8xUL4cfFDdjgmDOI4fjXXaD4MUbNxvxi9flw=; b=kvw77Z0frjYeurImypJfFbgF5BgaV1Uy2axEkaYsX0/dXnyhdxPw3qAA4c5hif+45VdMOQvxr6HzHJpU39kLsBxaC3rUYzjIr9seLRZZ0yPlqcKWs/0JaiYmWs8ZKUPxRavi+lJz+Q6prTC4jW6WSOJ7cSP4mz/9OHcVFlYuFyZfn935tZPLp3acPiwEAYocDcuBOJKmbs3dRNETx7Zqz4dtzBZmrhj3W/8NRtsWCfNK0qlMf3LbraxoUXTHKSH5gK55F5pYOnX2/a9AxAGnbG/0obCBumE88O1hYOdsiQtuUYkMlt5G5ZN1KSrNwWVUOq8SLWusi/+H6pYEJX0B0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 217.86.141.140) smtp.rcpttodomain=esd.eu smtp.mailfrom=esd.eu; dmarc=bestguesspass action=none header.from=esd.eu; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=esdhannover.onmicrosoft.com; s=selector1-esdhannover-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=phX3IWb8xUL4cfFDdjgmDOI4fjXXaD4MUbNxvxi9flw=; b=vVdbJ7sX2wVeIcQtGSZbv5oqGjzzMlonbuMI8R3oZJwNp7//sw0uhO7MhNWkSOZVOB6b8paku1xQ44YGKC0/aablJv9xAQYTKZiwUIK8fRvefTVPCo9xxYZ8Dt12VBPXx0CHD681eurUqkuvXmmlu2Jnnr+G0PD8Bw3kv2+ueJw= Received: from AS9PR06CA0043.eurprd06.prod.outlook.com (2603:10a6:20b:463::19) by PA4PR03MB6894.eurprd03.prod.outlook.com (2603:10a6:102:ec::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Fri, 24 Jun 2022 19:05:48 +0000 Received: from VI1EUR06FT044.eop-eur06.prod.protection.outlook.com (2603:10a6:20b:463:cafe::b4) by AS9PR06CA0043.outlook.office365.com (2603:10a6:20b:463::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15 via Frontend Transport; Fri, 24 Jun 2022 19:05:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 217.86.141.140) smtp.mailfrom=esd.eu; dkim=none (message not signed) header.d=none;dmarc=bestguesspass action=none header.from=esd.eu; Received-SPF: Pass (protection.outlook.com: domain of esd.eu designates 217.86.141.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.86.141.140; helo=esd-s7.esd; pr=C Received: from esd-s7.esd (217.86.141.140) by VI1EUR06FT044.mail.protection.outlook.com (10.13.6.117) with Microsoft SMTP Server id 15.20.5373.15 via Frontend Transport; Fri, 24 Jun 2022 19:05:47 +0000 Received: from esd-s20.esd.local (debby [10.0.0.190]) by esd-s7.esd (Postfix) with ESMTPS id 7A3D67C16CA; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) Received: by esd-s20.esd.local (Postfix, from userid 2046) id 607AF2E4AF3; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) From: Frank Jungclaus To: linux-can@vger.kernel.org, Marc Kleine-Budde , Wolfgang Grandegger , Vincent Mailhol Cc: =?utf-8?q?Stefan_M=C3=A4tje?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frank Jungclaus Subject: [PATCH 4/5] can/esd_usb: Fixed some checkpatch.pl warnings Date: Fri, 24 Jun 2022 21:05:18 +0200 Message-Id: <20220624190517.2299701-5-frank.jungclaus@esd.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220624190517.2299701-1-frank.jungclaus@esd.eu> References: <20220624190517.2299701-1-frank.jungclaus@esd.eu> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3370a31c-8bc2-4dc6-0db8-08da56148c37 X-MS-TrafficTypeDiagnostic: PA4PR03MB6894:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3g1SqXAJ0Yb9BQXxMyEXn52u88jcK2pSugsvRFmkneYngWkTvThM12PLdX0jLnAwytdFncjYklnGh4sCqEJiLv+U4dXun6/kpRyVWuUqUFFECPxec7HGB4u8uR7qDrv2Hq5QqjOxwW2/SjTmfKUcAuqpmRuzYcoygKvBlnWWA+NPNQ3cvzzGK1jUPu5naJ2JM3kbOgy/JSUzLHdbPlcnJal0RB2D40aUUFLmeMxyL/E23TONR4Lvg41hYuCVe80BB/Hxy9q3fGoV0V7lT2SsvVCKieMZ932sRAjNLGst07BVnkELKLwInnxfVkaKrQqcmbihD0fRdEGD+xJCrhuyOhhiOAbdAt8IXjt+2L3swljKSg5Ybf6OPPZgxkonGnkD98iHliHGlKXlZEMEY+xMg70pJ95kJbIhOTSNenPIRmBZThJXgYuUlWrG+2DyvvB1z7VwpJKmODSCNSq8G20IyYHw7EmjkhVLIN54ti/hbTCbq96FuVaaWh00BfCiE/9z13x4yBjn9NYcfLlgYNe5bjzuULkcRWPayyUHk1N0ynZeA5F/rCBoFqYRbZtx/BRMpRgXoG0n6b4V17Zd9CpyOCSWC+aoi2chiAhT662GTJkCiosW80RIMrPSDJVN3Lf5M3I/y8iLdn/hQIEhddgmmt4X54723z5TmIJaM5Q+p6yI/0aKAD8X85VlZ1q8kdoi0BgVJ020wZLWFQVrrN9nIZJsV0y7LgjEwAHQiSII1CBwSxFJ5isuEHfCru9MxpHvkrGEoE1HTmowLQs6HslApA== X-Forefront-Antispam-Report: CIP:217.86.141.140;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:esd-s7.esd;PTR:pd9568d8c.dip0.t-ipconnect.de;CAT:NONE;SFS:(13230016)(4636009)(396003)(39830400003)(346002)(376002)(136003)(46966006)(36840700001)(83380400001)(8676002)(5660300002)(6666004)(336012)(1076003)(82310400005)(70206006)(2616005)(4326008)(86362001)(40480700001)(70586007)(8936002)(44832011)(186003)(47076005)(6266002)(478600001)(316002)(41300700001)(356005)(110136005)(26005)(81166007)(2906002)(36860700001)(36756003)(42186006)(54906003);DIR:OUT;SFP:1102; X-OriginatorOrg: esd.eu X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 19:05:47.7161 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3370a31c-8bc2-4dc6-0db8-08da56148c37 X-MS-Exchange-CrossTenant-Id: 5a9c3a1d-52db-4235-b74c-9fd851db2e6b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5a9c3a1d-52db-4235-b74c-9fd851db2e6b;Ip=[217.86.141.140];Helo=[esd-s7.esd] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT044.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6894 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Signed-off-by: Frank Jungclaus --- drivers/net/can/usb/esd_usb.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c index befd570018d7..e23dce3db55a 100644 --- a/drivers/net/can/usb/esd_usb.c +++ b/drivers/net/can/usb/esd_usb.c @@ -163,7 +163,7 @@ struct set_baudrate_msg { }; /* Main message type used between library and application */ -struct __attribute__ ((packed)) esd_usb_msg { +struct __packed esd_usb_msg { union { struct header_msg hdr; struct version_msg version; @@ -343,8 +343,6 @@ static void esd_usb_rx_can_msg(struct esd_usb_net_priv *priv, netif_rx(skb); } - - return; } static void esd_usb_tx_done_msg(struct esd_usb_net_priv *priv, @@ -447,13 +445,9 @@ static void esd_usb_read_bulk_callback(struct urb *urb) dev_err(dev->udev->dev.parent, "failed resubmitting read bulk urb: %d\n", retval); } - - return; } -/* - * callback for bulk IN urb - */ +/* callback for bulk IN urb */ static void esd_usb_write_bulk_callback(struct urb *urb) { struct esd_tx_urb_context *context = urb->context; @@ -611,9 +605,7 @@ static int esd_usb_setup_rx_urbs(struct esd_usb *dev) return 0; } -/* - * Start interface - */ +/* Start interface */ static int esd_usb_start(struct esd_usb_net_priv *priv) { struct esd_usb *dev = priv->usb; @@ -627,8 +619,7 @@ static int esd_usb_start(struct esd_usb_net_priv *priv) goto out; } - /* - * Enable all IDs + /* Enable all IDs * The IDADD message takes up to 64 32 bit bitmasks (2048 bits). * Each bit represents one 11 bit CAN identifier. A set bit * enables reception of the corresponding CAN identifier. A cleared @@ -776,9 +767,7 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb, } } - /* - * This may never happen. - */ + /* This may never happen */ if (!context) { netdev_warn(netdev, "couldn't find free context\n"); ret = NETDEV_TX_BUSY; @@ -826,8 +815,7 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb, netif_trans_update(netdev); - /* - * Release our reference to this URB, the USB core will eventually free + /* Release our reference to this URB, the USB core will eventually free * it entirely. */ usb_free_urb(urb); @@ -1043,8 +1031,7 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index) return err; } -/* - * probe function for new USB devices +/* probe function for new USB devices * * check version information and number of available * CAN interfaces @@ -1120,9 +1107,7 @@ static int esd_usb_probe(struct usb_interface *intf, return err; } -/* - * called by the usb core when the device is removed from the system - */ +/* called by the usb core when the device is removed from the system */ static void esd_usb_disconnect(struct usb_interface *intf) { struct esd_usb *dev = usb_get_intfdata(intf); From patchwork Fri Jun 24 19:05:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Jungclaus X-Patchwork-Id: 12895019 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AF0AC43334 for ; Fri, 24 Jun 2022 19:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231772AbiFXTF5 (ORCPT ); Fri, 24 Jun 2022 15:05:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231469AbiFXTFw (ORCPT ); Fri, 24 Jun 2022 15:05:52 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50092.outbound.protection.outlook.com [40.107.5.92]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8167E81D85; Fri, 24 Jun 2022 12:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+DuJqUqOpwtsF1Pmo3axMPeBYbo2Xjv9yTwhSZmKhxlgQrLcrS6fLwX0Dvv1uGNG6kLa6Fbgexv8yH6IAqanbrLDIsWtNDZnCGo5boxInQvY+LhXMmSSqmrU3pOfCM9Jd7WC82mZlNC06s58+uUB9H6I8HWXWe5S5QFMHOEuluW9gBlqyP0XeAANGeUri/qIGvm8rYWQShtOEcS/6kYYygXWYddJ6vZtB3+2eFP0yXoU66d2m5ILvk0U2RCzjb46KDCVBOmclhhfmGp7ZMk60+AGoAdh/634oIL2aNqu5tuwbH96K3G/JDzCFEhFIFF9mzbE5+MTJIxERkb9lI4lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LfP0tOz+7MWo/tXaqlT6yj+tKF2DtPYZb65U/lAP9n8=; b=IPtjDDxvuNQFd0hcQpU2ZxPIBZRJVAZdcnQMPfw7q7n1/r8FiruCZJsv6QIl/mRXbvnANAaQ1rOxk88W2Kn8p0SJWEXh4NaqZF8ovfFq+JeXjdO/H+jYIL1bisQQ//TSFKGWlRPYwqfvB0uT2/IYpvuPJFaB329NyWfAJyvGiQir40ayC6QVgTjhjvnLBShWZEEZRS1cZ9NJ8Ww6KExbImv7yFRbjW5YDzWkOdR4BUiEbMt8lyjVPYoF/6Te+fglg1TFcvzxKH3euh1AtoYCVx2rRhNYEavGuCCkYUVuB2h49kqK2ls6Lvbx2kFe0wvqee1gdcrm1qCpgvtO0ikEaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 217.86.141.140) smtp.rcpttodomain=esd.eu smtp.mailfrom=esd.eu; dmarc=bestguesspass action=none header.from=esd.eu; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=esdhannover.onmicrosoft.com; s=selector1-esdhannover-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LfP0tOz+7MWo/tXaqlT6yj+tKF2DtPYZb65U/lAP9n8=; b=VmythIqHPFjGbFDADUQ3I2fw7vT/7k+/bDi0Sux5edq6YVLSWkZsrQRqxLemiY1GAEm4LmMDQPSI/teIYwh/1DfygFXx2k10dwwdDZcuTbM+GBKMcGjU6yDWStMogHBChSrpfG7GxEo0kV8jbHkm4renGaU41j9k/IZF7ofISrc= Received: from DB3PR06CA0011.eurprd06.prod.outlook.com (2603:10a6:8:1::24) by VI1PR03MB3951.eurprd03.prod.outlook.com (2603:10a6:803:6a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 19:05:48 +0000 Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2603:10a6:8:1:cafe::f9) by DB3PR06CA0011.outlook.office365.com (2603:10a6:8:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16 via Frontend Transport; Fri, 24 Jun 2022 19:05:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 217.86.141.140) smtp.mailfrom=esd.eu; dkim=none (message not signed) header.d=none;dmarc=bestguesspass action=none header.from=esd.eu; Received-SPF: Pass (protection.outlook.com: domain of esd.eu designates 217.86.141.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.86.141.140; helo=esd-s7.esd; pr=C Received: from esd-s7.esd (217.86.141.140) by DB8EUR06FT015.mail.protection.outlook.com (10.233.252.156) with Microsoft SMTP Server id 15.20.5373.15 via Frontend Transport; Fri, 24 Jun 2022 19:05:47 +0000 Received: from esd-s20.esd.local (debby [10.0.0.190]) by esd-s7.esd (Postfix) with ESMTPS id 80D1B7C16CB; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) Received: by esd-s20.esd.local (Postfix, from userid 2046) id 69C602E4AF0; Fri, 24 Jun 2022 21:05:47 +0200 (CEST) From: Frank Jungclaus To: linux-can@vger.kernel.org, Marc Kleine-Budde , Wolfgang Grandegger , Vincent Mailhol Cc: =?utf-8?q?Stefan_M=C3=A4tje?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frank Jungclaus Subject: [PATCH 5/5] can/esd_usb: Update to copyright, M_AUTHOR and M_DESCRIPTION Date: Fri, 24 Jun 2022 21:05:19 +0200 Message-Id: <20220624190517.2299701-6-frank.jungclaus@esd.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220624190517.2299701-1-frank.jungclaus@esd.eu> References: <20220624190517.2299701-1-frank.jungclaus@esd.eu> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ecfae95f-22e1-4093-531a-08da56148c3d X-MS-TrafficTypeDiagnostic: VI1PR03MB3951:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CntANY44iug4cVTLcRi/LtDTfQ4Xnv4sKVa0BmuPkrjDDjGm/nsXZ7CPQhs0ysqdn6KZlkfNXeL1LB1fPYOTa1QVnloo9uxDCiuK/jzgfhuBJH0sqjvhpwPD1Xkb2a6DCHf8b6/ju4szbQHDyop4RmR+7KQVnKPH+c5u9SnSyxC0BrEtZR3obH7L4Gp1Aob+QXWN9/ZTdXsleiss8WdHyeizkZZKYZcAAxAFaBChpsnlKllUaUSWjpHRUdeTNfZiB78HenrYq69RNjKsI6exx2Y/Vc+N4JlwVxETiG9rI8OGIMmKx7/sXKcC5gsD0yO51j9ryVJPPVP1RYvGk3vpgRiH9QHsR9qmksU7I7HUA0hc1wKyvskESpN0l+UWUzP4jbRCoBo1YuXfAnMIcRJvEzuZ+G07BC+5/AYnR2+ISFkVgY+xDAabsKjha7IXQ9c8H2XaQubo4SwfUWuN6yI7qlJXei57jRGJC3c/ZF1SjbQTXFqPAxHVOR4pZzJRNPX7FqsJWKuLfqgkkq93Z+kgWiSO5q8I/ebVAP+fZjN5eH9GApD9IsGLVatAuTt3j9QF5oNsrVdXisUtemXZl6fi8RcvM9lzDSe0kRAzZzbAH6p/Az9eARQFAoF8oV4SNEL206VNDtzXmOYXLCETzI1lHEc27ISqrg3R2TOZ/Dsihj5ayB1P00r5rT/J1/qJbeJCZ+BdQ9x4JSEFjRFGs15RaqeVz7ptHcSjuCU6cfEhXR/SsG7N3vcjNIrDzIzL/AgD5WgGfbXyRofG1LAnKVKMGg== X-Forefront-Antispam-Report: CIP:217.86.141.140;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:esd-s7.esd;PTR:pd9568d8c.dip0.t-ipconnect.de;CAT:NONE;SFS:(13230016)(4636009)(396003)(376002)(346002)(39830400003)(136003)(36840700001)(46966006)(15650500001)(41300700001)(86362001)(6266002)(8936002)(40480700001)(70586007)(316002)(42186006)(82310400005)(36756003)(2906002)(81166007)(70206006)(1076003)(110136005)(83380400001)(356005)(6666004)(5660300002)(336012)(8676002)(36860700001)(478600001)(47076005)(2616005)(44832011)(186003)(54906003)(26005)(4326008);DIR:OUT;SFP:1102; X-OriginatorOrg: esd.eu X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 19:05:47.7416 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ecfae95f-22e1-4093-531a-08da56148c3d X-MS-Exchange-CrossTenant-Id: 5a9c3a1d-52db-4235-b74c-9fd851db2e6b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5a9c3a1d-52db-4235-b74c-9fd851db2e6b;Ip=[217.86.141.140];Helo=[esd-s7.esd] X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB3951 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org - Brought the copyright notice up to date - Also regarding the changed company name from esd electronic system design gmbh to esd electronics gmbh - Using socketcan@esd.eu as a generic mail address for matthias who left esd 6 years before - Added a second MODULE_AUTHOR() for Frank Jungclaus Signed-off-by: Frank Jungclaus --- drivers/net/can/usb/esd_usb.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c index e23dce3db55a..8a4bf2961f3d 100644 --- a/drivers/net/can/usb/esd_usb.c +++ b/drivers/net/can/usb/esd_usb.c @@ -1,8 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * CAN driver for esd CAN-USB/2 and CAN-USB/Micro + * CAN driver for esd electronics gmbh CAN-USB/2 and CAN-USB/Micro * - * Copyright (C) 2010-2012 Matthias Fuchs , esd gmbh + * Copyright (C) 2010-2012 esd electronic system design gmbh, Matthias Fuchs + * Copyright (C) 2022 esd electronics gmbh, Frank Jungclaus */ #include #include @@ -14,8 +15,9 @@ #include #include -MODULE_AUTHOR("Matthias Fuchs "); -MODULE_DESCRIPTION("CAN driver for esd CAN-USB/2 and CAN-USB/Micro interfaces"); +MODULE_AUTHOR("Matthias Fuchs "); +MODULE_AUTHOR("Frank Jungclaus "); +MODULE_DESCRIPTION("CAN driver for esd electronics gmbh CAN-USB/2 and CAN-USB/Micro interfaces"); MODULE_LICENSE("GPL v2"); /* USB vendor and product ID */