From nobody Tue Dec 2 02:52:32 2025 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 932EC335069 for ; Mon, 17 Nov 2025 14:40:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390434; cv=none; b=Adqjy6rjikj6+y72BCG4JpeouEmIyayFMPguReD5odFWsO4PcQIG0j6GRHF6PPipTLBqlViM+qkppCsJdRQB0La4ULqOd0uhiDBn4OJMh3idcArEAsHnweQSLwZaJ6QIsNp1GloUkP/ADsILdORI8ngSHyME5x7YDs5eBiQWdms= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390434; c=relaxed/simple; bh=r9JMpPVLznPtmHrSdt7bNv5qgNIue3TmK7buOh6dR5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C8YoZjTVqMlYQJEvxtx9H4AJwcw+ateOxkbVkvx8P4kXFV0HbJ0vukR+mX6cvtwrvyhY4C7RbhABXMhcEEl3VSpfsZI86hZTxqd41Zc8P9tYNHNpFTmlhqBgSGBSE+Y0z4dWQJCOtGqBld798DvMZnbu3M7uBxtt80YLf1rSGRE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PZomj8dB; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PZomj8dB" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-429c82bf86bso2498590f8f.1 for ; Mon, 17 Nov 2025 06:40:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763390431; x=1763995231; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vPEi+OAnaxyP0YUa8fcTgwPLmAffwifnaMBooozroQM=; b=PZomj8dBstaMZiQKtmjHLZ+zrWRsEFuZLGmDfQLs00UhY2eXi91BPdmBglr449+UKA LuH2/Jjw8T6HJkFhGcBTr+0lsX7yEZiWvtLHmMYroPWdDtt1bKIkRKDEcfMta68HgR39 ayzYT6bADLTyOsX93wW5QG5FbLzEOw586SE9M+KyJpOBUAmwYWgVe8SuIMEaPHnyxFhR nBqynO6bqoMg1nFcOYsQyjUIA/N77M80vfvJIohsPC2B2eu0Mqo1sITrJNGlPKmSgXIk 3zfZ/1LkbvGmLSTYus1Q/cRKxwhy4aI8hfIU4m2LnN0o4NNpYf0sRFmJphLlnjFVyRcV hXsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763390431; x=1763995231; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vPEi+OAnaxyP0YUa8fcTgwPLmAffwifnaMBooozroQM=; b=NjA6mBqRkAFxnPWxeprbosXyMgf5utqCjPy3A34wuMW/BpgIevv4j2ukRFbl9R9JzE ffjFACEfOK30hczDjzgER9B/KeOv5QOiDW+1mayNoMM5bKUzL5ZSMSnV9693yaVMJiGx VS7ROqXtiPEIifE0orrI9IrB6yJQ3O1zR0C8wwYB4ulHYoNTLjrBlsbaolleka4V0WbP JiZW+f1ZHUKn4XyrDjkVl/YfOSngMFTDixHneoBQmD3nouOOSM4XYFvYCU4SmordLWUC Z7elLmrNLcLNGFsO5N8pFpTPQYxQ1HhtuJ++Geva8nov1lRz+Xb3smoG6Tnf9LdTGusv EUdg== X-Forwarded-Encrypted: i=1; AJvYcCVN2ZPPIID0jSxmzRihO19w2TcvV8VwTCwkU3IvqFtMnVkmN1xy/eWKWhEezf+lkbz5LIjCRGTU37f0tFY=@vger.kernel.org X-Gm-Message-State: AOJu0YyTZ52DdADXC+s5Ae6bwGTCPd4wpVb6PlsTXMImVr5u00A2RsWp Zu/yWA1dtGAHEkFVlR4g/Ba4nrDLhu0BgTIz9kbnUwVLTOaoTmR1f51j71Gr8a2n X-Gm-Gg: ASbGnct5cFl52JNPLfT3Ny1YVWzOHzQb/3PglSilipgBDoK+CeHFqdfFZC+xORYS1Dk T148VLjb/YPZxp5x1+UqzIxCLnTM/wQAi9Tg5Ax0yanZXb0e77FzVJf3qnJEhQamNVt95IXltS9 nqqN+hCtzGGT3/pIMqf4TY871q+CC5Ph0P2RgDr8fZv/P3KF2/65OKsYmrDnbLt1H4gdlHhTmLw 1SYrwjRMbMXjKcj09PGGBlq9B1fgeaWPx4Hn+BYo1splk/ZLd6Hod2eJr17SJNmeDkAwTNxpg7e 8SjJZzm27w+H833JRA8RARnomyN1VaGPFXBB+NcKnRNro9ggBvgJUW6Q9hG4NyedEL7i3c1yY1i xBMQ9bPr4XoB0Fzzvu7P6hZuT7uiX+eQUs30dTMxXyucMKeUMnhLI0dd+cZciuf843pUo3I2qZh 03JY7E3qhJ4poLFhj3edVEnCxbV34= X-Google-Smtp-Source: AGHT+IEaaNt6GS6Jhr5WNjOs2UitFiM0H3PayD04c4C1r3GeZ0Otr8z0XUjjN56IxSF1NCqkQ5Ad3Q== X-Received: by 2002:a05:6000:26cc:b0:42b:41dc:1b5d with SMTP id ffacd0b85a97d-42b593452f6mr11872408f8f.25.1763390430862; Mon, 17 Nov 2025 06:40:30 -0800 (PST) Received: from egonzo (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b53f206e2sm26788218f8f.41.2025.11.17.06.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 06:40:30 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: johan@kernel.org, Dave Penkler , kernel test robot Subject: [PATCH V4 1/4] staging: gpib: Change // comments in uapi header file Date: Mon, 17 Nov 2025 15:40:18 +0100 Message-ID: <20251117144021.23569-2-dpenkler@gmail.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251117144021.23569-1-dpenkler@gmail.com> References: <20251117144021.23569-1-dpenkler@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A ppc64 randconfig build complained about the // comments in the uapi header file: error: // comments are not allowed in this language [-Werror,-Wcomment] Change the // comments to /* */ format. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202511141203.sbp27oAR-lkp@int= el.com/ Signed-off-by: Dave Penkler --- drivers/staging/gpib/uapi/gpib_ioctl.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/drivers/staging/gpib/= uapi/gpib_ioctl.h index 55bf5e55507a..1cfee6b44ac3 100644 --- a/drivers/staging/gpib/uapi/gpib_ioctl.h +++ b/drivers/staging/gpib/uapi/gpib_ioctl.h @@ -40,7 +40,7 @@ struct gpib_serial_poll_ioctl { __u32 pad; __s32 sad; __u8 status_byte; - __u8 padding[3]; // align to 32 bit boundary + __u8 padding[3]; /* align to 32 bit boundary */ }; =20 struct gpib_eos_ioctl { @@ -80,7 +80,7 @@ struct gpib_board_info_ioctl { __u32 t1_delay; unsigned ist : 1; unsigned no_7_bit_eos : 1; - unsigned padding :30; // align to 32 bit boundary + unsigned padding :30; /* align to 32 bit boundary */ }; =20 struct gpib_select_pci_ioctl { @@ -92,7 +92,7 @@ struct gpib_ppoll_config_ioctl { __u8 config; unsigned set_ist : 1; unsigned clear_ist : 1; - unsigned padding :22; // align to 32 bit boundary + unsigned padding :22; /* align to 32 bit boundary */ }; =20 struct gpib_pad_ioctl { @@ -105,15 +105,15 @@ struct gpib_sad_ioctl { __s32 sad; }; =20 -// select a piece of hardware to attach by its sysfs device path +/* select a piece of hardware to attach by its sysfs device path */ struct gpib_select_device_path_ioctl { char device_path[0x1000]; }; =20 -// update status byte and request service +/* update status byte and request service */ struct gpib_request_service2 { __u8 status_byte; - __u8 padding[3]; // align to 32 bit boundary + __u8 padding[3]; /* align to 32 bit boundary */ __s32 new_reason_for_service; }; =20 @@ -160,7 +160,7 @@ enum gpib_ioctl { IBPP2_SET =3D _IOW(GPIB_CODE, 40, __s16), IBPP2_GET =3D _IOR(GPIB_CODE, 41, __s16), IBSELECT_DEVICE_PATH =3D _IOW(GPIB_CODE, 43, struct gpib_select_device_pa= th_ioctl), - // 44 was IBSELECT_SERIAL_NUMBER + /* 44 was IBSELECT_SERIAL_NUMBER */ IBRSV2 =3D _IOW(GPIB_CODE, 45, struct gpib_request_service2) }; =20 --=20 2.51.2 From nobody Tue Dec 2 02:52:32 2025 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8077E33555B for ; Mon, 17 Nov 2025 14:40:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390436; cv=none; b=bP4b+DIft8NGcrtWIDJtu07S0PJOQBjik/bC+tojFk8i7yUUpTcQF25wQnkDZJEZ30PvYN3yubalPy0Vj0K/TWAAF4puaR+jvfdCRnzmrujKIbZlNGEkCHLzE8oR8IK/t3vK4pcNh9KkH9DzuUZi/LG8vUGFr45aWuR7csmezsc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390436; c=relaxed/simple; bh=8lQxcKvouaei16FqYGY0RR8AerBRZPOQndfjxzjaGZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UauXa0+TEF0KC75oXPN1EIZMkgU62BUMqhAoj1KpbvowUMJ6wEMuuC8VZ/7njKjFhLkY+S5LzzaMM3tKkIBSo/g1DRc8DQ8yhJaZ6YQ9vLQ5zcACT4IpPjeJbwFW65aeYtmFQsEAnCce5muOobymZlpng0iEtFuEAAQcEsbhg0g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TNvtZVP8; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TNvtZVP8" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-42bb288c1bfso1437962f8f.2 for ; Mon, 17 Nov 2025 06:40:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763390433; x=1763995233; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1iqFxV3svYobU0TK9f8Y5DAj+U7MQujkDDouJLinQ98=; b=TNvtZVP8zh/pTISpcp/xrSNV7xaFhZ6bZ9i4aR6IWqxus9MpeIvNwOoNACWs2dgprJ 13tfnRiYS11Zk8axOicdbb7DOrGySfMZcprCfQ9Q1tcYaxs+vNWoKvGPz+NAi2DP2Jzn rhNMBrZndwV1X+Hc8+ESV09U8wYLrpCtd6Shzytn8YAlaeWUqvC3WNz1sv+I9r4LXwrq wE+1f2c3pWHC7MwCuW133YWiEmLWfBaJ2tj6VqjoXNR2hL9iw0GBnPDf+iZbee50lzJB hm3OoYVw7QOEXTQj0ZlmJjlDbPtcYo3nYKN48OqXWZlpjGGLdacevKMVRoHyr3nwZXZt qNSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763390433; x=1763995233; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1iqFxV3svYobU0TK9f8Y5DAj+U7MQujkDDouJLinQ98=; b=wyuSQWELVZVeTsq5Njt24eIF57hCT6meXeHyyKqS+EvrmiJanX5z/4Z7cXrB24Jlyt ny4WBzeEL0QeapNXyGmBooxXrju/BjVkZKxk5Rgc3BncNkv5lP+ksWJ3L8oAkFkH7dDf Ojn7nRRQU+bSUIvUULpUF9gb5NT0ObfXpurg6/Gwoqna8nNLJIeLHKsEvKBj6sgz8+dY fWKBsNksiGA1ZJOa3yMKECzdOZGIbqS2wROrDof7aSs3WKT2DjNW1G6qpJ9BHE3/EI4S uuZt7b7/7ONZssDv/AiQnLEuz7e7Vq8DWdZnhGYtte4ctcYOTgEZuZPP+DuGStLXUEbG bttA== X-Forwarded-Encrypted: i=1; AJvYcCXG3wVJ+hThW5jdvSbcd7tKVO+V3sRXAJTlJvcmagV0tnite5xlt1QqCbpfUTE78luekKxHIj/5Zmbpa74=@vger.kernel.org X-Gm-Message-State: AOJu0YxSsWIDARlV0VDpYvkcPSa48A5DZoydfeFx3lXUWVnXcaNXj4/9 dVSdIKipyJu6l0vJxyYolvMSr2a4KrEOYKK+UOQbkTV94XBMq4gWi6ChaYhSG7R8 X-Gm-Gg: ASbGncvlio6UcSe4NU9ttnn/eXhMwYHb0ymEcwQLVVnEsqEzqEzwQcTHnxBtudFe7kb tccj/IzdxIv2CdcUlJ7bxs3uhbV0eeiOE9IIhBHiu8y9x20z6VIGP9EHN4cYEry+62IEw5LE/5g qrhdWhqAeRtrBixHxmsxQ9Gi7v1QNt/60VsHvH+gRaDgTp+wbewyl1XCDjhnlfaf/RzaLmYUUzM KjXYYzjw3TGc5iypwAIVMDan/4D93KY5rjJqqIBBRjb2k6aCXt/qqGyTNZi8OFykKpJPF5Q0dUF WHh6uWgSWXJ81W9cECdPLvjEshfOjVcjTmJsfOuicDmNkE5DLdoxjY50f9H7HGD+vbb7wxgvzfC d6E8sPDgZXfwvnu+cVfHrAVGLnwH3g/ls+sxohAXOUSslbnsjXAmljuWGs/SqaCJDGfhD+qLlMt bnf4xld9anLDhFqxVdqa/xueqUBslmloqpbww72A== X-Google-Smtp-Source: AGHT+IGYOrLag2thTn3SYWZDnMpEs52Wd+QcpLBwLxTLhLinzGRFJnryAdhIXXD6W20N7XuPmJkL+Q== X-Received: by 2002:a05:6000:26d2:b0:427:167:c2c3 with SMTP id ffacd0b85a97d-42b59398a6fmr12059621f8f.48.1763390432673; Mon, 17 Nov 2025 06:40:32 -0800 (PST) Received: from egonzo (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b53f206e2sm26788218f8f.41.2025.11.17.06.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 06:40:32 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: johan@kernel.org, Dave Penkler Subject: [PATCH V4 2/4] staging: gpib: Update TODO file Date: Mon, 17 Nov 2025 15:40:19 +0100 Message-ID: <20251117144021.23569-3-dpenkler@gmail.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251117144021.23569-1-dpenkler@gmail.com> References: <20251117144021.23569-1-dpenkler@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The comments have now been fixed so remove the item about comments from the TODO file. Signed-off-by: Dave Penkler --- drivers/staging/gpib/TODO | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/staging/gpib/TODO b/drivers/staging/gpib/TODO index ab41a7f9ca5b..ac07dd90b4ef 100644 --- a/drivers/staging/gpib/TODO +++ b/drivers/staging/gpib/TODO @@ -4,20 +4,6 @@ TODO: CHECK:ALLOC_SIZEOF_STRUCT: Prefer kmalloc(sizeof(*board->private_data)= ...) over kmalloc(sizeof(struct xxx_priv)...) ./gpio/gpib_bitbang.c:50: ERROR:COMPLEX_MACRO: Macros with complex val= ues should be enclosed in parenthese This warning will be addressed later: WARNING:UNDOCUMENTED_DT_STRING: D= T compatible string -- tidy-up comments: - - there are some "//comments" and "// comments" scattered around - - sometimes they are misaligned - - sometimes "// comments" are interleaved with "/* comments */" - - multiline comments should start with initial almost-blank line: - /* - * Good - * multiline - * comment - */ - /* Bad - * multiline - * comment - */ - resolve XXX notes where possible - fix FIXME notes - clean-up commented-out code --=20 2.51.2 From nobody Tue Dec 2 02:52:32 2025 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E1503358A8 for ; Mon, 17 Nov 2025 14:40:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390438; cv=none; b=n0gRSzcCpIOqFaFxgy5xYypt3YSWlyo0fMw7Qq8f0tdSj1kky1uxF3oLL5eoLlxQ6xTH7q+5vzv5ApCgu0iMi6MPVNIFvtyQRybxbeg4vO8pt8jhh5LqttIRJ8kZutxCPDlpWazY2eKPjMsK2k+tgLosCUGuBnkzpbuSyAtwDnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390438; c=relaxed/simple; bh=eimoQ+FdKA9+pxE/MGHkV1aEQJ4Aum+o/HO4FuPQDW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zcd2atOaskk/X09qTCuZXujLS7zIgH6p8eDfSeK9lAuewga2SsFOgorkWFpXNUZaeh16fW4CCYyr5CDIWme2OEE0qk0lB6ptkRt84saJhVdhQrNPbcmjJ+OIA0MHBa+204UNdg0FJ9bkEU71RD8v39fofJnPpiY7vbjE9EZTZgg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=igrLUG4b; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="igrLUG4b" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-47798ded6fcso6256615e9.1 for ; Mon, 17 Nov 2025 06:40:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763390434; x=1763995234; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZJB2FqiO6SGFfYYapjgo9o+2feU29SxCG7Fhx4LKfdY=; b=igrLUG4blM7YJI48tLXLyxEG1fakeRW/Y7Zmlc3pceCJznSclrzhkoZAyhxdi5D9tw WrDNjPv1zageJoHTu8gGrtNwUZinH65u4KLFJHyyGx6xre4VTcTIxse3if69mE8t2c0D YsdwjyyKewVBUNxcmYQfHXXL54+/PMKyHvM4C6+OlzBDNf008LFD9S1cDgZEq6jrYwuz nHZwwXgY2F9oMa6BTbbiiOXn1e7rJg26iQmgong7QwfcLQE+CM7dB9CBCrl/UCub/t8l Pjo8EEcOGY853BexLqZgAYGrjlnGufs+H9fae3h92xsko5191T/vBLMm8LCXWbPcRoEd H7/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763390434; x=1763995234; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZJB2FqiO6SGFfYYapjgo9o+2feU29SxCG7Fhx4LKfdY=; b=Gx4MEDO+Mdq0WRT1p7wvgJrEABkrWYDpze1UIBSX+p40Sq+obBDxWm1VzxWUhKKkS1 a1YQdUo1VL8m9+KBUCjQ5lP3jJNtrHJKpmCspAYgGhak11MAHHpYxRcI0/v++X4CdkII VBdSOdqMR1u1oKkIsjyX/rARZMk55NrtbRPPqDV6DssU/jnbtyBXxByAr/9xkKxV3CPj 89954hR0bR7Jxd8h/Wq3Zsen/jUdV0t3N0Adjp1jFzEkMzJNmICS/AzeZZ7jDMkI8g6M elxr3aAMhLYsFr3SOILY3DAlpH6uKn+hXDIC0ckG+7McZX6dxDY6C//RRVAWRxQr64DH aqNg== X-Forwarded-Encrypted: i=1; AJvYcCWuUUysLdAs6vhSDsE+87plw8JK+2T++k7rkcwUbBz0inOjjTRpxq4RbIkXrxMzlpBBsc3tbm+B5xbC8NM=@vger.kernel.org X-Gm-Message-State: AOJu0YzFTikc8BsKI4LfhfPbd5IzZumKtGu2et7UiJfnn1wN0pHTukZy u6e42Be2FLeGFJnKujScluA4ZFwHgdJDmPPvGz/tSylegm0OnlWoO5dA X-Gm-Gg: ASbGncuKpNQP1hcOroRiGfr6kJ4AUapeUI5YD78ZKq40c1FN1TCIxeUe+d8EBkzitQ0 s9mfqZY5G2DE7/s1ExEgjYwiM7dsagqMDc7RUuJd9X0L3Pofq93p1t5ilEBFl3R41Sc4QyHvc0k TMKXuHp9LqqtJG/21rAkUhuoWrnPGdi0IxKEigTgYU5PuhGSX+w9sj58oh5sLHJdUiwNCYWpBKh wtJiUtcpIHBfQ6bp+paV8jOuUg9CSqvJu6c0ZLbvehESBZ+fkYTfi2VU/MJ7fSKTS8H7KrY11bO Nbts6YWn//O3zXImVliXuuVFEuK5/lq+kgb12Ills1SyiDVbaDeSrroUMQFuoZwi9s3aPzAoMGT +rkxGBQG/ya9w3X7iBrTp6JsxmQmOexKIsXw/+Vs1bTqcklO3gg+MoJeijj7Rg59h62KD8McjME /LW0MApP8iY54+lBGAHKZ2oeu0JrQ= X-Google-Smtp-Source: AGHT+IET/L3J+QYHxiket2aQeo32G4hu1ru3eL3/lY/cNs4Z6XvnWh8uMVYVGGR6Y1EJjCps4scrKw== X-Received: by 2002:a05:600c:3587:b0:477:5897:a0c4 with SMTP id 5b1f17b1804b1-4778fe59a00mr110607835e9.4.1763390434298; Mon, 17 Nov 2025 06:40:34 -0800 (PST) Received: from egonzo (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b53f206e2sm26788218f8f.41.2025.11.17.06.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 06:40:34 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: johan@kernel.org, Dave Penkler Subject: [PATCH V4 3/4] staging: gpib: Fix SPDX license for gpib headers Date: Mon, 17 Nov 2025 15:40:20 +0100 Message-ID: <20251117144021.23569-4-dpenkler@gmail.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251117144021.23569-1-dpenkler@gmail.com> References: <20251117144021.23569-1-dpenkler@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As part destaging the gpib drivers we need to add the WITH Linux-syscall-note to the SPDX license in the gpib common includes as these will be part of the kernel headers. Signed-off-by: Dave Penkler --- drivers/staging/gpib/uapi/gpib.h | 2 +- drivers/staging/gpib/uapi/gpib_ioctl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gpib/uapi/gpib.h b/drivers/staging/gpib/uapi/g= pib.h index ddf82a4d989f..2a7f5eeb9777 100644 --- a/drivers/staging/gpib/uapi/gpib.h +++ b/drivers/staging/gpib/uapi/gpib.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ =20 /*************************************************************************= ** * copyright : (C) 2002 by Frank Mori Hess diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/drivers/staging/gpib/= uapi/gpib_ioctl.h index 1cfee6b44ac3..d544d8e4362c 100644 --- a/drivers/staging/gpib/uapi/gpib_ioctl.h +++ b/drivers/staging/gpib/uapi/gpib_ioctl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ =20 /*************************************************************************= ** * copyright : (C) 2002 by Frank Mori Hess --=20 2.51.2 From nobody Tue Dec 2 02:52:32 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D1C124291E for ; Mon, 17 Nov 2025 14:40:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390441; cv=none; b=Gtn1V9vAZ7rOQzO/6/sGOD/IxC1LbuD58sJqGEjAdDySDgoBombn3006YYipXNa2Q0UOHMWDseyw7EG8BUNJslAGDE2KPxvYdch2uLNCN6i9cvH5bSU2hlEkc6tbOAueBSRI9kD/f3WjXQTO8KqESzM3G7w2m4UuYjZZ+WaNI+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390441; c=relaxed/simple; bh=49Fq7z8rr9iNUC3aJPrXBEEPETVa64Of6k6EleqFeOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bZpztM3Kt/NoqskqvXTqL/+Xe11CG3yPEgh5Bs6OTn+1iZ/I1cg/m12F6imoOgtepGivFwP0+g0rJCjY3DwMQubDhT2svW7ABkXqPdAoX8YJfIBnsfE5uOv7Z970Nken9N5IxdE1/Fbw+RnPs7aF0NDGis6gs8vMKZpqZn57tqE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gth8zPgh; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gth8zPgh" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-42bb288c17bso1192401f8f.2 for ; Mon, 17 Nov 2025 06:40:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763390436; x=1763995236; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3Yii5C4twAlUJAvClpEWNTwPYcaNMdqvufA42zYcUMg=; b=gth8zPghlAVJF+qBnFOIzb5fEedKha3brsL51HTGJQTAZA6STpyv4vXi13ukNudT20 PbAqEVvmgbUMaXPchiljL+aFTxZOgVxaPRRH6VoHbZSwnWY1n6cH+DPc3ASrK/qv/1Pv KnVUKD2NrHq02uQ2I0qSHb0AdpfxScyhnWG7yGBbpqN6dghlGmgFld2ZHjKpBb5X5oce YlbL7duJVdO0U7zmU4UaIvBF2GSMC3g1V+p5PJhTUUvu0sWJB3AsbS3nXXqvmm7FjqPZ ZgyjsthX6hnnbnELwIelPnJwSzgetG/BT4vzUAXsnZAbeuIYCIiQ+UvDEw9kinx9qtnf P9cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763390436; x=1763995236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3Yii5C4twAlUJAvClpEWNTwPYcaNMdqvufA42zYcUMg=; b=Jts+v4FoBYFiwZv1XBnVIWyYCUFCSttxIgH3dmGQYx0AsWxX54MRSzFTWsqQsbmtfd S5/a+7Crr4VW8GtmzZ4sERuKfLuH/TIJCTIppX15K9NJks300Eg65HQz4HUXd8kbi8vY XnDREfxj6Hb/9AnkmbxMJKJcRDk5iv3LwD0HlIiofzcRwwRyOtm18GH7i+IEkqV3dIgL G582oK3bU2PXubbqJ2zRGzg83UWYOhbTjTPvc3/gkNUHH6upwy+CDr6wyb+LbnVqMpD5 sbMd4ixsKVE7ODveljRzBseiU/NeZpJDvOaLXH2L48R70KQuPLytUiDnK2DgKTL6SJKt 4myw== X-Forwarded-Encrypted: i=1; AJvYcCV0RSAaTYCF6xuXyMpeAn7RxV8MblTpugAkfyRSsaiWEYJmbpZmKYbv/l7h90KXEc8hZPXWndoEX2GTl9s=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3Lw7QvL2VR1yPQOO28W3mvmoWTpD8RqxdQbhfKZSWK5HZBti9 FHdjeA1oCPViXY3Vj9KGLIrSxEd0rsQsLwexyBJpDIs2SKiuTJY5CbtPuzQjvBaJ X-Gm-Gg: ASbGnctW2Wj/c7TExWcfLgG82NXMNJ5VzSn0BJuHBxTTN0daCSosJrA9uUYZULTTm6d p58NYLwBM6sPwxfB9B3lu16sN4mctCvIpMFHr7MBb/Ki+d+zp8vd/0zc4IGr1M8QriqyGuS9KXk aY8/ueDo5/fzfklkbp3l3OimnaXsdBfKFmDYw13GllFLYOnJJv1i+Qv8olE46tk5NS6KIp3HoZo 1dFY+yxQaLlR34jlQi6vRGl5W2YVoPdeNHozJkefD26JIgCnE3EM8TWxpVQqhMCg9iBgkSCwvDQ ZFoPlOUTwnJuM6sz0JGgujJ4LqJ9iSXHr+dzilTsWKv1EC8IZfBu8n013EucRG49EtItngu7sNK hSBex74XUVGLztjhM9YMzj6+gt2mvpPuVAGn5JGxt2I4fqN9ONjPmDzLKfcMndEbXDyRzu6ALBT KlQrU5UH/HCKoSvM68g1j0SmiwjcE= X-Google-Smtp-Source: AGHT+IEpLRyOhmGIeDwoX2P/VD2UBl/lN4AJ3SEi682XMFlHV+G2CHR4lJUiw1cuJClwpnHUwPMRjQ== X-Received: by 2002:a05:6000:26c8:b0:42b:3ee9:4773 with SMTP id ffacd0b85a97d-42b59323452mr12477636f8f.7.1763390436156; Mon, 17 Nov 2025 06:40:36 -0800 (PST) Received: from egonzo (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b53f206e2sm26788218f8f.41.2025.11.17.06.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 06:40:35 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: johan@kernel.org, Dave Penkler Subject: [PATCH V4 4/4] gpib: Destage gpib Date: Mon, 17 Nov 2025 15:40:21 +0100 Message-ID: <20251117144021.23569-5-dpenkler@gmail.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251117144021.23569-1-dpenkler@gmail.com> References: <20251117144021.23569-1-dpenkler@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the gpib Kconfig menu and Makefile build rule from staging. Remove gpib/uapi from the header file search path in subdir-ccflags of the gpib Makefile As part of the destaging process the gpib/uapi header files will be moved to the standard kernel uapi directory include/uapi/linux Change the include file path in the code for these files accordingly. The gpib user space library needs the uapi header files in order to communicate with the drivers. Copy the common include files from staging/gpib/uapi to include/linux/uapi Move the gpib tree out of staging to drivers. Remove the word "Linux" from the gpib Kconfig file. Add the gpib Kconfig menu and Makefile build rule to drivers The gpib Kconfig menu has been added just after the related comedi drivers. MAINTAINERS: Change the gpib directory and add the uapi include files. Signed-off-by: Dave Penkler --- MAINTAINERS | 4 +++- drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/{staging =3D> }/gpib/Kconfig | 8 ++++---- drivers/{staging =3D> }/gpib/Makefile | 2 +- drivers/{staging =3D> }/gpib/TODO | 0 drivers/{staging =3D> }/gpib/agilent_82350b/Makefile | 0 .../{staging =3D> }/gpib/agilent_82350b/agilent_82350b.c | 0 .../{staging =3D> }/gpib/agilent_82350b/agilent_82350b.h | 0 drivers/{staging =3D> }/gpib/agilent_82357a/Makefile | 0 .../{staging =3D> }/gpib/agilent_82357a/agilent_82357a.c | 0 .../{staging =3D> }/gpib/agilent_82357a/agilent_82357a.h | 0 drivers/{staging =3D> }/gpib/cb7210/Makefile | 0 drivers/{staging =3D> }/gpib/cb7210/cb7210.c | 0 drivers/{staging =3D> }/gpib/cb7210/cb7210.h | 0 drivers/{staging =3D> }/gpib/cec/Makefile | 0 drivers/{staging =3D> }/gpib/cec/cec.h | 0 drivers/{staging =3D> }/gpib/cec/cec_gpib.c | 0 drivers/{staging =3D> }/gpib/common/Makefile | 0 drivers/{staging =3D> }/gpib/common/gpib_os.c | 0 drivers/{staging =3D> }/gpib/common/iblib.c | 0 drivers/{staging =3D> }/gpib/common/ibsys.h | 0 drivers/{staging =3D> }/gpib/eastwood/Makefile | 0 drivers/{staging =3D> }/gpib/eastwood/fluke_gpib.c | 0 drivers/{staging =3D> }/gpib/eastwood/fluke_gpib.h | 0 drivers/{staging =3D> }/gpib/fmh_gpib/Makefile | 0 drivers/{staging =3D> }/gpib/fmh_gpib/fmh_gpib.c | 0 drivers/{staging =3D> }/gpib/fmh_gpib/fmh_gpib.h | 0 drivers/{staging =3D> }/gpib/gpio/Makefile | 0 drivers/{staging =3D> }/gpib/gpio/gpib_bitbang.c | 0 drivers/{staging =3D> }/gpib/hp_82335/Makefile | 0 drivers/{staging =3D> }/gpib/hp_82335/hp82335.c | 0 drivers/{staging =3D> }/gpib/hp_82335/hp82335.h | 0 drivers/{staging =3D> }/gpib/hp_82341/Makefile | 0 drivers/{staging =3D> }/gpib/hp_82341/hp_82341.c | 0 drivers/{staging =3D> }/gpib/hp_82341/hp_82341.h | 0 drivers/{staging =3D> }/gpib/include/amcc5920.h | 0 drivers/{staging =3D> }/gpib/include/amccs5933.h | 0 drivers/{staging =3D> }/gpib/include/gpibP.h | 4 ++-- drivers/{staging =3D> }/gpib/include/gpib_cmd.h | 0 drivers/{staging =3D> }/gpib/include/gpib_pci_ids.h | 0 drivers/{staging =3D> }/gpib/include/gpib_proto.h | 0 drivers/{staging =3D> }/gpib/include/gpib_state_machines.h | 0 drivers/{staging =3D> }/gpib/include/gpib_types.h | 2 +- drivers/{staging =3D> }/gpib/include/nec7210.h | 0 drivers/{staging =3D> }/gpib/include/nec7210_registers.h | 0 drivers/{staging =3D> }/gpib/include/plx9050.h | 0 drivers/{staging =3D> }/gpib/include/quancom_pci.h | 0 drivers/{staging =3D> }/gpib/include/tms9914.h | 0 drivers/{staging =3D> }/gpib/include/tnt4882_registers.h | 0 drivers/{staging =3D> }/gpib/ines/Makefile | 0 drivers/{staging =3D> }/gpib/ines/ines.h | 0 drivers/{staging =3D> }/gpib/ines/ines_gpib.c | 0 drivers/{staging =3D> }/gpib/lpvo_usb_gpib/Makefile | 0 drivers/{staging =3D> }/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 0 drivers/{staging =3D> }/gpib/nec7210/Makefile | 0 drivers/{staging =3D> }/gpib/nec7210/board.h | 0 drivers/{staging =3D> }/gpib/nec7210/nec7210.c | 0 drivers/{staging =3D> }/gpib/ni_usb/Makefile | 0 drivers/{staging =3D> }/gpib/ni_usb/ni_usb_gpib.c | 0 drivers/{staging =3D> }/gpib/ni_usb/ni_usb_gpib.h | 0 drivers/{staging =3D> }/gpib/pc2/Makefile | 0 drivers/{staging =3D> }/gpib/pc2/pc2_gpib.c | 0 drivers/{staging =3D> }/gpib/tms9914/Makefile | 0 drivers/{staging =3D> }/gpib/tms9914/tms9914.c | 0 drivers/{staging =3D> }/gpib/tnt4882/Makefile | 0 drivers/{staging =3D> }/gpib/tnt4882/mite.c | 0 drivers/{staging =3D> }/gpib/tnt4882/mite.h | 0 drivers/{staging =3D> }/gpib/tnt4882/tnt4882_gpib.c | 0 drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - {drivers/staging/gpib/uapi =3D> include/uapi/linux}/gpib.h | 0 .../staging/gpib/uapi =3D> include/uapi/linux}/gpib_ioctl.h | 0 73 files changed, 14 insertions(+), 12 deletions(-) rename drivers/{staging =3D> }/gpib/Kconfig (97%) rename drivers/{staging =3D> }/gpib/Makefile (92%) rename drivers/{staging =3D> }/gpib/TODO (100%) rename drivers/{staging =3D> }/gpib/agilent_82350b/Makefile (100%) rename drivers/{staging =3D> }/gpib/agilent_82350b/agilent_82350b.c (100%) rename drivers/{staging =3D> }/gpib/agilent_82350b/agilent_82350b.h (100%) rename drivers/{staging =3D> }/gpib/agilent_82357a/Makefile (100%) rename drivers/{staging =3D> }/gpib/agilent_82357a/agilent_82357a.c (100%) rename drivers/{staging =3D> }/gpib/agilent_82357a/agilent_82357a.h (100%) rename drivers/{staging =3D> }/gpib/cb7210/Makefile (100%) rename drivers/{staging =3D> }/gpib/cb7210/cb7210.c (100%) rename drivers/{staging =3D> }/gpib/cb7210/cb7210.h (100%) rename drivers/{staging =3D> }/gpib/cec/Makefile (100%) rename drivers/{staging =3D> }/gpib/cec/cec.h (100%) rename drivers/{staging =3D> }/gpib/cec/cec_gpib.c (100%) rename drivers/{staging =3D> }/gpib/common/Makefile (100%) rename drivers/{staging =3D> }/gpib/common/gpib_os.c (100%) rename drivers/{staging =3D> }/gpib/common/iblib.c (100%) rename drivers/{staging =3D> }/gpib/common/ibsys.h (100%) rename drivers/{staging =3D> }/gpib/eastwood/Makefile (100%) rename drivers/{staging =3D> }/gpib/eastwood/fluke_gpib.c (100%) rename drivers/{staging =3D> }/gpib/eastwood/fluke_gpib.h (100%) rename drivers/{staging =3D> }/gpib/fmh_gpib/Makefile (100%) rename drivers/{staging =3D> }/gpib/fmh_gpib/fmh_gpib.c (100%) rename drivers/{staging =3D> }/gpib/fmh_gpib/fmh_gpib.h (100%) rename drivers/{staging =3D> }/gpib/gpio/Makefile (100%) rename drivers/{staging =3D> }/gpib/gpio/gpib_bitbang.c (100%) rename drivers/{staging =3D> }/gpib/hp_82335/Makefile (100%) rename drivers/{staging =3D> }/gpib/hp_82335/hp82335.c (100%) rename drivers/{staging =3D> }/gpib/hp_82335/hp82335.h (100%) rename drivers/{staging =3D> }/gpib/hp_82341/Makefile (100%) rename drivers/{staging =3D> }/gpib/hp_82341/hp_82341.c (100%) rename drivers/{staging =3D> }/gpib/hp_82341/hp_82341.h (100%) rename drivers/{staging =3D> }/gpib/include/amcc5920.h (100%) rename drivers/{staging =3D> }/gpib/include/amccs5933.h (100%) rename drivers/{staging =3D> }/gpib/include/gpibP.h (96%) rename drivers/{staging =3D> }/gpib/include/gpib_cmd.h (100%) rename drivers/{staging =3D> }/gpib/include/gpib_pci_ids.h (100%) rename drivers/{staging =3D> }/gpib/include/gpib_proto.h (100%) rename drivers/{staging =3D> }/gpib/include/gpib_state_machines.h (100%) rename drivers/{staging =3D> }/gpib/include/gpib_types.h (99%) rename drivers/{staging =3D> }/gpib/include/nec7210.h (100%) rename drivers/{staging =3D> }/gpib/include/nec7210_registers.h (100%) rename drivers/{staging =3D> }/gpib/include/plx9050.h (100%) rename drivers/{staging =3D> }/gpib/include/quancom_pci.h (100%) rename drivers/{staging =3D> }/gpib/include/tms9914.h (100%) rename drivers/{staging =3D> }/gpib/include/tnt4882_registers.h (100%) rename drivers/{staging =3D> }/gpib/ines/Makefile (100%) rename drivers/{staging =3D> }/gpib/ines/ines.h (100%) rename drivers/{staging =3D> }/gpib/ines/ines_gpib.c (100%) rename drivers/{staging =3D> }/gpib/lpvo_usb_gpib/Makefile (100%) rename drivers/{staging =3D> }/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c (100%) rename drivers/{staging =3D> }/gpib/nec7210/Makefile (100%) rename drivers/{staging =3D> }/gpib/nec7210/board.h (100%) rename drivers/{staging =3D> }/gpib/nec7210/nec7210.c (100%) rename drivers/{staging =3D> }/gpib/ni_usb/Makefile (100%) rename drivers/{staging =3D> }/gpib/ni_usb/ni_usb_gpib.c (100%) rename drivers/{staging =3D> }/gpib/ni_usb/ni_usb_gpib.h (100%) rename drivers/{staging =3D> }/gpib/pc2/Makefile (100%) rename drivers/{staging =3D> }/gpib/pc2/pc2_gpib.c (100%) rename drivers/{staging =3D> }/gpib/tms9914/Makefile (100%) rename drivers/{staging =3D> }/gpib/tms9914/tms9914.c (100%) rename drivers/{staging =3D> }/gpib/tnt4882/Makefile (100%) rename drivers/{staging =3D> }/gpib/tnt4882/mite.c (100%) rename drivers/{staging =3D> }/gpib/tnt4882/mite.h (100%) rename drivers/{staging =3D> }/gpib/tnt4882/tnt4882_gpib.c (100%) rename {drivers/staging/gpib/uapi =3D> include/uapi/linux}/gpib.h (100%) rename {drivers/staging/gpib/uapi =3D> include/uapi/linux}/gpib_ioctl.h (1= 00%) diff --git a/MAINTAINERS b/MAINTAINERS index df07d1a3c28d..4cb0de3777b5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10628,7 +10628,9 @@ F: drivers/platform/x86/gpd-pocket-fan.c GPIB DRIVERS M: Dave Penkler S: Maintained -F: drivers/staging/gpib/ +F: drivers/gpib/ +F: include/uapi/linux/gpib.h +F: include/uapi/linux/gpib_ioctl.h =20 GPIO ACPI SUPPORT M: Mika Westerberg diff --git a/drivers/Kconfig b/drivers/Kconfig index 4915a63866b0..01602581b880 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -161,6 +161,8 @@ source "drivers/greybus/Kconfig" =20 source "drivers/comedi/Kconfig" =20 +source "drivers/gpib/Kconfig" + source "drivers/staging/Kconfig" =20 source "drivers/platform/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 8e1ffa4358d5..d275b1526cdd 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -150,6 +150,7 @@ obj-$(CONFIG_VHOST_IOTLB) +=3D vhost/ obj-$(CONFIG_VHOST) +=3D vhost/ obj-$(CONFIG_GREYBUS) +=3D greybus/ obj-$(CONFIG_COMEDI) +=3D comedi/ +obj-$(CONFIG_GPIB) +=3D gpib/ obj-$(CONFIG_STAGING) +=3D staging/ obj-y +=3D platform/ =20 diff --git a/drivers/staging/gpib/Kconfig b/drivers/gpib/Kconfig similarity index 97% rename from drivers/staging/gpib/Kconfig rename to drivers/gpib/Kconfig index aa01538d5beb..eeb50956ce85 100644 --- a/drivers/staging/gpib/Kconfig +++ b/drivers/gpib/Kconfig @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 menuconfig GPIB - tristate "Linux GPIB drivers" + tristate "GPIB drivers" help - Enable support for GPIB cards and dongles for Linux. GPIB - is the General Purpose Interface Bus which conforms to the - IEEE488 standard. + Enable support for GPIB cards and dongles. GPIB is the + General Purpose Interface Bus which conforms to the IEEE488 + standard. =20 This set of drivers can be used with the corresponding user space library that can be found on Sourceforge under linux-gpib. diff --git a/drivers/staging/gpib/Makefile b/drivers/gpib/Makefile similarity index 92% rename from drivers/staging/gpib/Makefile rename to drivers/gpib/Makefile index d0e88f5c0844..2d44fed2a743 100644 --- a/drivers/staging/gpib/Makefile +++ b/drivers/gpib/Makefile @@ -1,5 +1,5 @@ =20 -subdir-ccflags-y +=3D -I$(src)/include -I$(src)/uapi +subdir-ccflags-y +=3D -I$(src)/include =20 obj-$(CONFIG_GPIB_AGILENT_82350B) +=3D agilent_82350b/ obj-$(CONFIG_GPIB_AGILENT_82357A) +=3D agilent_82357a/ diff --git a/drivers/staging/gpib/TODO b/drivers/gpib/TODO similarity index 100% rename from drivers/staging/gpib/TODO rename to drivers/gpib/TODO diff --git a/drivers/staging/gpib/agilent_82350b/Makefile b/drivers/gpib/ag= ilent_82350b/Makefile similarity index 100% rename from drivers/staging/gpib/agilent_82350b/Makefile rename to drivers/gpib/agilent_82350b/Makefile diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers= /gpib/agilent_82350b/agilent_82350b.c similarity index 100% rename from drivers/staging/gpib/agilent_82350b/agilent_82350b.c rename to drivers/gpib/agilent_82350b/agilent_82350b.c diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.h b/drivers= /gpib/agilent_82350b/agilent_82350b.h similarity index 100% rename from drivers/staging/gpib/agilent_82350b/agilent_82350b.h rename to drivers/gpib/agilent_82350b/agilent_82350b.h diff --git a/drivers/staging/gpib/agilent_82357a/Makefile b/drivers/gpib/ag= ilent_82357a/Makefile similarity index 100% rename from drivers/staging/gpib/agilent_82357a/Makefile rename to drivers/gpib/agilent_82357a/Makefile diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers= /gpib/agilent_82357a/agilent_82357a.c similarity index 100% rename from drivers/staging/gpib/agilent_82357a/agilent_82357a.c rename to drivers/gpib/agilent_82357a/agilent_82357a.c diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.h b/drivers= /gpib/agilent_82357a/agilent_82357a.h similarity index 100% rename from drivers/staging/gpib/agilent_82357a/agilent_82357a.h rename to drivers/gpib/agilent_82357a/agilent_82357a.h diff --git a/drivers/staging/gpib/cb7210/Makefile b/drivers/gpib/cb7210/Mak= efile similarity index 100% rename from drivers/staging/gpib/cb7210/Makefile rename to drivers/gpib/cb7210/Makefile diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/gpib/cb7210/cb7= 210.c similarity index 100% rename from drivers/staging/gpib/cb7210/cb7210.c rename to drivers/gpib/cb7210/cb7210.c diff --git a/drivers/staging/gpib/cb7210/cb7210.h b/drivers/gpib/cb7210/cb7= 210.h similarity index 100% rename from drivers/staging/gpib/cb7210/cb7210.h rename to drivers/gpib/cb7210/cb7210.h diff --git a/drivers/staging/gpib/cec/Makefile b/drivers/gpib/cec/Makefile similarity index 100% rename from drivers/staging/gpib/cec/Makefile rename to drivers/gpib/cec/Makefile diff --git a/drivers/staging/gpib/cec/cec.h b/drivers/gpib/cec/cec.h similarity index 100% rename from drivers/staging/gpib/cec/cec.h rename to drivers/gpib/cec/cec.h diff --git a/drivers/staging/gpib/cec/cec_gpib.c b/drivers/gpib/cec/cec_gpi= b.c similarity index 100% rename from drivers/staging/gpib/cec/cec_gpib.c rename to drivers/gpib/cec/cec_gpib.c diff --git a/drivers/staging/gpib/common/Makefile b/drivers/gpib/common/Mak= efile similarity index 100% rename from drivers/staging/gpib/common/Makefile rename to drivers/gpib/common/Makefile diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/gpib/common/gp= ib_os.c similarity index 100% rename from drivers/staging/gpib/common/gpib_os.c rename to drivers/gpib/common/gpib_os.c diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/gpib/common/ibli= b.c similarity index 100% rename from drivers/staging/gpib/common/iblib.c rename to drivers/gpib/common/iblib.c diff --git a/drivers/staging/gpib/common/ibsys.h b/drivers/gpib/common/ibsy= s.h similarity index 100% rename from drivers/staging/gpib/common/ibsys.h rename to drivers/gpib/common/ibsys.h diff --git a/drivers/staging/gpib/eastwood/Makefile b/drivers/gpib/eastwood= /Makefile similarity index 100% rename from drivers/staging/gpib/eastwood/Makefile rename to drivers/gpib/eastwood/Makefile diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/gpib/east= wood/fluke_gpib.c similarity index 100% rename from drivers/staging/gpib/eastwood/fluke_gpib.c rename to drivers/gpib/eastwood/fluke_gpib.c diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.h b/drivers/gpib/east= wood/fluke_gpib.h similarity index 100% rename from drivers/staging/gpib/eastwood/fluke_gpib.h rename to drivers/gpib/eastwood/fluke_gpib.h diff --git a/drivers/staging/gpib/fmh_gpib/Makefile b/drivers/gpib/fmh_gpib= /Makefile similarity index 100% rename from drivers/staging/gpib/fmh_gpib/Makefile rename to drivers/gpib/fmh_gpib/Makefile diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/gpib/fmh_gp= ib/fmh_gpib.c similarity index 100% rename from drivers/staging/gpib/fmh_gpib/fmh_gpib.c rename to drivers/gpib/fmh_gpib/fmh_gpib.c diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.h b/drivers/gpib/fmh_gp= ib/fmh_gpib.h similarity index 100% rename from drivers/staging/gpib/fmh_gpib/fmh_gpib.h rename to drivers/gpib/fmh_gpib/fmh_gpib.h diff --git a/drivers/staging/gpib/gpio/Makefile b/drivers/gpib/gpio/Makefile similarity index 100% rename from drivers/staging/gpib/gpio/Makefile rename to drivers/gpib/gpio/Makefile diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/gpib/gpio/g= pib_bitbang.c similarity index 100% rename from drivers/staging/gpib/gpio/gpib_bitbang.c rename to drivers/gpib/gpio/gpib_bitbang.c diff --git a/drivers/staging/gpib/hp_82335/Makefile b/drivers/gpib/hp_82335= /Makefile similarity index 100% rename from drivers/staging/gpib/hp_82335/Makefile rename to drivers/gpib/hp_82335/Makefile diff --git a/drivers/staging/gpib/hp_82335/hp82335.c b/drivers/gpib/hp_8233= 5/hp82335.c similarity index 100% rename from drivers/staging/gpib/hp_82335/hp82335.c rename to drivers/gpib/hp_82335/hp82335.c diff --git a/drivers/staging/gpib/hp_82335/hp82335.h b/drivers/gpib/hp_8233= 5/hp82335.h similarity index 100% rename from drivers/staging/gpib/hp_82335/hp82335.h rename to drivers/gpib/hp_82335/hp82335.h diff --git a/drivers/staging/gpib/hp_82341/Makefile b/drivers/gpib/hp_82341= /Makefile similarity index 100% rename from drivers/staging/gpib/hp_82341/Makefile rename to drivers/gpib/hp_82341/Makefile diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/gpib/hp_823= 41/hp_82341.c similarity index 100% rename from drivers/staging/gpib/hp_82341/hp_82341.c rename to drivers/gpib/hp_82341/hp_82341.c diff --git a/drivers/staging/gpib/hp_82341/hp_82341.h b/drivers/gpib/hp_823= 41/hp_82341.h similarity index 100% rename from drivers/staging/gpib/hp_82341/hp_82341.h rename to drivers/gpib/hp_82341/hp_82341.h diff --git a/drivers/staging/gpib/include/amcc5920.h b/drivers/gpib/include= /amcc5920.h similarity index 100% rename from drivers/staging/gpib/include/amcc5920.h rename to drivers/gpib/include/amcc5920.h diff --git a/drivers/staging/gpib/include/amccs5933.h b/drivers/gpib/includ= e/amccs5933.h similarity index 100% rename from drivers/staging/gpib/include/amccs5933.h rename to drivers/gpib/include/amccs5933.h diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/gpib/include/gp= ibP.h similarity index 96% rename from drivers/staging/gpib/include/gpibP.h rename to drivers/gpib/include/gpibP.h index 1b27f37e0ba0..e3938ada3e0d 100644 --- a/drivers/staging/gpib/include/gpibP.h +++ b/drivers/gpib/include/gpibP.h @@ -12,8 +12,8 @@ #include "gpib_types.h" #include "gpib_proto.h" #include "gpib_cmd.h" -#include "gpib.h" -#include "gpib_ioctl.h" +#include +#include =20 #include #include diff --git a/drivers/staging/gpib/include/gpib_cmd.h b/drivers/gpib/include= /gpib_cmd.h similarity index 100% rename from drivers/staging/gpib/include/gpib_cmd.h rename to drivers/gpib/include/gpib_cmd.h diff --git a/drivers/staging/gpib/include/gpib_pci_ids.h b/drivers/gpib/inc= lude/gpib_pci_ids.h similarity index 100% rename from drivers/staging/gpib/include/gpib_pci_ids.h rename to drivers/gpib/include/gpib_pci_ids.h diff --git a/drivers/staging/gpib/include/gpib_proto.h b/drivers/gpib/inclu= de/gpib_proto.h similarity index 100% rename from drivers/staging/gpib/include/gpib_proto.h rename to drivers/gpib/include/gpib_proto.h diff --git a/drivers/staging/gpib/include/gpib_state_machines.h b/drivers/g= pib/include/gpib_state_machines.h similarity index 100% rename from drivers/staging/gpib/include/gpib_state_machines.h rename to drivers/gpib/include/gpib_state_machines.h diff --git a/drivers/staging/gpib/include/gpib_types.h b/drivers/gpib/inclu= de/gpib_types.h similarity index 99% rename from drivers/staging/gpib/include/gpib_types.h rename to drivers/gpib/include/gpib_types.h index 998abb379749..5a0978ae27e7 100644 --- a/drivers/staging/gpib/include/gpib_types.h +++ b/drivers/gpib/include/gpib_types.h @@ -8,7 +8,7 @@ #define _GPIB_TYPES_H =20 #ifdef __KERNEL__ -#include "gpib.h" +#include #include #include #include diff --git a/drivers/staging/gpib/include/nec7210.h b/drivers/gpib/include/= nec7210.h similarity index 100% rename from drivers/staging/gpib/include/nec7210.h rename to drivers/gpib/include/nec7210.h diff --git a/drivers/staging/gpib/include/nec7210_registers.h b/drivers/gpi= b/include/nec7210_registers.h similarity index 100% rename from drivers/staging/gpib/include/nec7210_registers.h rename to drivers/gpib/include/nec7210_registers.h diff --git a/drivers/staging/gpib/include/plx9050.h b/drivers/gpib/include/= plx9050.h similarity index 100% rename from drivers/staging/gpib/include/plx9050.h rename to drivers/gpib/include/plx9050.h diff --git a/drivers/staging/gpib/include/quancom_pci.h b/drivers/gpib/incl= ude/quancom_pci.h similarity index 100% rename from drivers/staging/gpib/include/quancom_pci.h rename to drivers/gpib/include/quancom_pci.h diff --git a/drivers/staging/gpib/include/tms9914.h b/drivers/gpib/include/= tms9914.h similarity index 100% rename from drivers/staging/gpib/include/tms9914.h rename to drivers/gpib/include/tms9914.h diff --git a/drivers/staging/gpib/include/tnt4882_registers.h b/drivers/gpi= b/include/tnt4882_registers.h similarity index 100% rename from drivers/staging/gpib/include/tnt4882_registers.h rename to drivers/gpib/include/tnt4882_registers.h diff --git a/drivers/staging/gpib/ines/Makefile b/drivers/gpib/ines/Makefile similarity index 100% rename from drivers/staging/gpib/ines/Makefile rename to drivers/gpib/ines/Makefile diff --git a/drivers/staging/gpib/ines/ines.h b/drivers/gpib/ines/ines.h similarity index 100% rename from drivers/staging/gpib/ines/ines.h rename to drivers/gpib/ines/ines.h diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/gpib/ines/ines= _gpib.c similarity index 100% rename from drivers/staging/gpib/ines/ines_gpib.c rename to drivers/gpib/ines/ines_gpib.c diff --git a/drivers/staging/gpib/lpvo_usb_gpib/Makefile b/drivers/gpib/lpv= o_usb_gpib/Makefile similarity index 100% rename from drivers/staging/gpib/lpvo_usb_gpib/Makefile rename to drivers/gpib/lpvo_usb_gpib/Makefile diff --git a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/g= pib/lpvo_usb_gpib/lpvo_usb_gpib.c similarity index 100% rename from drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c rename to drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c diff --git a/drivers/staging/gpib/nec7210/Makefile b/drivers/gpib/nec7210/M= akefile similarity index 100% rename from drivers/staging/gpib/nec7210/Makefile rename to drivers/gpib/nec7210/Makefile diff --git a/drivers/staging/gpib/nec7210/board.h b/drivers/gpib/nec7210/bo= ard.h similarity index 100% rename from drivers/staging/gpib/nec7210/board.h rename to drivers/gpib/nec7210/board.h diff --git a/drivers/staging/gpib/nec7210/nec7210.c b/drivers/gpib/nec7210/= nec7210.c similarity index 100% rename from drivers/staging/gpib/nec7210/nec7210.c rename to drivers/gpib/nec7210/nec7210.c diff --git a/drivers/staging/gpib/ni_usb/Makefile b/drivers/gpib/ni_usb/Mak= efile similarity index 100% rename from drivers/staging/gpib/ni_usb/Makefile rename to drivers/gpib/ni_usb/Makefile diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/gpib/ni_us= b/ni_usb_gpib.c similarity index 100% rename from drivers/staging/gpib/ni_usb/ni_usb_gpib.c rename to drivers/gpib/ni_usb/ni_usb_gpib.c diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.h b/drivers/gpib/ni_us= b/ni_usb_gpib.h similarity index 100% rename from drivers/staging/gpib/ni_usb/ni_usb_gpib.h rename to drivers/gpib/ni_usb/ni_usb_gpib.h diff --git a/drivers/staging/gpib/pc2/Makefile b/drivers/gpib/pc2/Makefile similarity index 100% rename from drivers/staging/gpib/pc2/Makefile rename to drivers/gpib/pc2/Makefile diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/gpib/pc2/pc2_gpi= b.c similarity index 100% rename from drivers/staging/gpib/pc2/pc2_gpib.c rename to drivers/gpib/pc2/pc2_gpib.c diff --git a/drivers/staging/gpib/tms9914/Makefile b/drivers/gpib/tms9914/M= akefile similarity index 100% rename from drivers/staging/gpib/tms9914/Makefile rename to drivers/gpib/tms9914/Makefile diff --git a/drivers/staging/gpib/tms9914/tms9914.c b/drivers/gpib/tms9914/= tms9914.c similarity index 100% rename from drivers/staging/gpib/tms9914/tms9914.c rename to drivers/gpib/tms9914/tms9914.c diff --git a/drivers/staging/gpib/tnt4882/Makefile b/drivers/gpib/tnt4882/M= akefile similarity index 100% rename from drivers/staging/gpib/tnt4882/Makefile rename to drivers/gpib/tnt4882/Makefile diff --git a/drivers/staging/gpib/tnt4882/mite.c b/drivers/gpib/tnt4882/mit= e.c similarity index 100% rename from drivers/staging/gpib/tnt4882/mite.c rename to drivers/gpib/tnt4882/mite.c diff --git a/drivers/staging/gpib/tnt4882/mite.h b/drivers/gpib/tnt4882/mit= e.h similarity index 100% rename from drivers/staging/gpib/tnt4882/mite.h rename to drivers/gpib/tnt4882/mite.h diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/gpib/tnt= 4882/tnt4882_gpib.c similarity index 100% rename from drivers/staging/gpib/tnt4882/tnt4882_gpib.c rename to drivers/gpib/tnt4882/tnt4882_gpib.c diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 075e775d3868..2f92cd698bef 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -48,6 +48,4 @@ source "drivers/staging/axis-fifo/Kconfig" =20 source "drivers/staging/vme_user/Kconfig" =20 -source "drivers/staging/gpib/Kconfig" - endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e681e403509c..f5b8876aa536 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -13,4 +13,3 @@ obj-$(CONFIG_MOST) +=3D most/ obj-$(CONFIG_GREYBUS) +=3D greybus/ obj-$(CONFIG_BCM2835_VCHIQ) +=3D vc04_services/ obj-$(CONFIG_XIL_AXIS_FIFO) +=3D axis-fifo/ -obj-$(CONFIG_GPIB) +=3D gpib/ diff --git a/drivers/staging/gpib/uapi/gpib.h b/include/uapi/linux/gpib.h similarity index 100% rename from drivers/staging/gpib/uapi/gpib.h rename to include/uapi/linux/gpib.h diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/include/uapi/linux/gp= ib_ioctl.h similarity index 100% rename from drivers/staging/gpib/uapi/gpib_ioctl.h rename to include/uapi/linux/gpib_ioctl.h --=20 2.51.2