From nobody Sun Feb 8 00:18:42 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 E2648289800 for ; Tue, 3 Jun 2025 18:43:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748976235; cv=none; b=eQq92flmXq5bkKieYDQsXE9/EsDK09pZ7j7EhuTOHulmU+K+7SWTUmi54R6ZNR4oIo9ZwK1eirGr864wGyOMj2bCh8OjfZKiUi9wiXMsejPl/vaPAh9oXb8ITeMRb8m4A76Q3z+hgSeG8XoeNxBs6VupdXTul+Ti9/DB2kOxlmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748976235; c=relaxed/simple; bh=Qh9Dxn1evd1IaoF2kKXcp+Uncn/nb5PU20RpJf21dfY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GxuRrKujqt+QORl4srnsBN4Ttw0Pku/Gw/wjGlSMKt+4h2ZC+92E6ATaL4GAiFQW/H71rSOASUfS9dmWoJJa1hCb8q6a438Q2YYKuaZ5/0/QHRZBoPOvbmMqDxuqDcG9I0VMXdqy0N6zTyFivSwHkucYmSA71I4dbofRB/YnZ6g= 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=X+ES2Bim; arc=none smtp.client-ip=209.85.221.53 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="X+ES2Bim" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3a361b8a664so5764326f8f.3 for ; Tue, 03 Jun 2025 11:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748976232; x=1749581032; 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=/IGAXxz13MqEbH+PXFjdEnFfsqBlovXRPcKg3pDAzSE=; b=X+ES2BimH61N+TEP5PErqUFXL6PsuTk19ryQWk4s/CD0AIHqLWqed1x61GBvRBYIBk H8H/G2UgwVA0bEWq+reEr1X4QuuZK7JgfS3FqkTbb3jpuKljoh9/k3WR+V095GGwaycp JWGMwUrPAfFHIqeOXlFefXmiUHzlVrr6f+t6CtLg+8Wtw8H5NF53YoQFD833SL06D12S CeAlII9dX+5HW7yR7ZhV49EkOQCCVTR4bFtLLDwuvPYSD7BTv9ayJldp3doJ7vylP/rO Iy8PHAUfzuqaYMNMnr7wWzy8FOw2WuWtLeh5QP7IYcFEJ2igHPwuLS/3QpCGbcoy6tMB Wgig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748976232; x=1749581032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/IGAXxz13MqEbH+PXFjdEnFfsqBlovXRPcKg3pDAzSE=; b=pCoZndXEF+rkbHFU/6uNX7uCRLVnNMbeAvmk+s1hlxNAKGChuZDWlzq7BaSimeTFZx uPR3j28SbDSUkPlWlCaLm6Ef0lTxSBpESkz+JFPnzBJjmdLlD8p0acC++/NfmfHY+Lqe qqFKC7zJEkmIgbOFBzoRzlYdCzXqPu1NRMmzbE5nJ+2ZYTpP61HHOllwgbp7LaUDejMD f0Wb7pIauNJBkO4D2UHOjKJlL/9YUnKmezf2kAgdXof4svaWkkrB23s2ACetrHqnO2yJ 6IWdMjruxd0cDs6pepYNSi38xDAjc7HdKG4cenmJ21lSEpEokeXWol+jQ/vmaGc4nXEk 40UA== X-Forwarded-Encrypted: i=1; AJvYcCVuel96svIfrkbzHA3WRP9Ax2hJ/TXSZz9W7BEZtKLxv1R/9CJCtQd0Rtsnc1t1tSCNtBSLlOjhcQIimfM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1gidfsyiAcHt+idLbQ8OVu/fht0EPpfhOhUlVBy9pskk0szEQ fAQf6fITTWI59L5iMbohNRZDbLLtS2nE6CPX1WvnQVQBfZXpoYKyqs/k X-Gm-Gg: ASbGncuKHpcNpquorTcurwZ24W/BTWSVDbQWzgze1/rQNCsm+fAbnnXF5/Ek2mGzLO4 K6X+3sfJHJLvEJsc9kgKv08QXKAMfOFqNW5XYpMIhaBmXYW1tiewnIbrDE2ul3ggK7YuqaxeaG7 y680EaOkIxxDi+aTTZ20fH6f8lg9Pn2CgZ2KRVtSKoodBX6RqLLOzpvMVrDgjRnzmfxAKPJ0zF4 iJfB0IRs8Ud65dOwXBesF4PW5GLqaw4HKCgj5ra1vliQltu/Uspk6syX4e77pQMaSG6ya79Odwy NtH1n1GUoK3xiLCh1i1GCkKEwAHZijofCV3hkqvQXuavagna66uoNmmOufpxqWsjQVHrsHaawfp 0KCNXAvV29x4= X-Google-Smtp-Source: AGHT+IGtZlug9Tz9tkgitUZDAPYu1Yoz8QMGQhWJvbQqWZMlTuZ1W9twlmq82Xd5Az+rq0ec8jOshA== X-Received: by 2002:a05:6000:22ca:b0:3a4:e841:ee76 with SMTP id ffacd0b85a97d-3a4f7a9d5cdmr13579712f8f.37.1748976231788; Tue, 03 Jun 2025 11:43:51 -0700 (PDT) Received: from localhost.localdomain (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4efe73f83sm18449959f8f.49.2025.06.03.11.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jun 2025 11:43:51 -0700 (PDT) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 1/4] staging: gpib: Remove unneeded enums and functions Date: Tue, 3 Jun 2025 20:43:17 +0200 Message-ID: <20250603184320.30594-2-dpenkler@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603184320.30594-1-dpenkler@gmail.com> References: <20250603184320.30594-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 enums and functions that do not need to be shared with user space. Remove enums and functions that are not needed in the kernel drivers. Signed-off-by: Dave Penkler --- drivers/staging/gpib/uapi/gpib.h | 198 ------------------------------- 1 file changed, 198 deletions(-) diff --git a/drivers/staging/gpib/uapi/gpib.h b/drivers/staging/gpib/uapi/g= pib.h index 41500cee4029..ddf82a4d989f 100644 --- a/drivers/staging/gpib/uapi/gpib.h +++ b/drivers/staging/gpib/uapi/gpib.h @@ -83,204 +83,12 @@ enum bus_control_line { BUS_EOI =3D 0x8000 /* EOI line status bit */ }; =20 -/* Possible GPIB command messages */ - -enum cmd_byte { - GTL =3D 0x1, /* go to local */ - SDC =3D 0x4, /* selected device clear */ - PP_CONFIG =3D 0x5, -#ifndef PPC - PPC =3D PP_CONFIG, /* parallel poll configure */ -#endif - GET =3D 0x8, /* group execute trigger */ - TCT =3D 0x9, /* take control */ - LLO =3D 0x11, /* local lockout */ - DCL =3D 0x14, /* device clear */ - PPU =3D 0x15, /* parallel poll unconfigure */ - SPE =3D 0x18, /* serial poll enable */ - SPD =3D 0x19, /* serial poll disable */ - CFE =3D 0x1f, /* configure enable */ - LAD =3D 0x20, /* value to be 'ored' in to obtain listen address */ - UNL =3D 0x3F, /* unlisten */ - TAD =3D 0x40, /* value to be 'ored' in to obtain talk address */ - UNT =3D 0x5F, /* untalk */ - SAD =3D 0x60, /* my secondary address (base) */ - PPE =3D 0x60, /* parallel poll enable (base) */ - PPD =3D 0x70 /* parallel poll disable */ -}; - enum ppe_bits { PPC_DISABLE =3D 0x10, PPC_SENSE =3D 0x8, /* parallel poll sense bit */ PPC_DIO_MASK =3D 0x7 }; =20 -/* confine address to range 0 to 30. */ -static inline unsigned int gpib_address_restrict(unsigned int addr) -{ - addr &=3D 0x1f; - if (addr =3D=3D 0x1f) - addr =3D 0; - return addr; -} - -static inline __u8 MLA(unsigned int addr) -{ - return gpib_address_restrict(addr) | LAD; -} - -static inline __u8 MTA(unsigned int addr) -{ - return gpib_address_restrict(addr) | TAD; -} - -static inline __u8 MSA(unsigned int addr) -{ - return (addr & 0x1f) | SAD; -} - -static inline __u8 PPE_byte(unsigned int dio_line, int sense) -{ - __u8 cmd; - - cmd =3D PPE; - if (sense) - cmd |=3D PPC_SENSE; - cmd |=3D (dio_line - 1) & 0x7; - return cmd; -} - -/* mask of bits that actually matter in a command byte */ -enum { - gpib_command_mask =3D 0x7f, -}; - -static inline int is_PPE(__u8 command) -{ - return (command & 0x70) =3D=3D 0x60; -} - -static inline int is_PPD(__u8 command) -{ - return (command & 0x70) =3D=3D 0x70; -} - -static inline int in_addressed_command_group(__u8 command) -{ - return (command & 0x70) =3D=3D 0x0; -} - -static inline int in_universal_command_group(__u8 command) -{ - return (command & 0x70) =3D=3D 0x10; -} - -static inline int in_listen_address_group(__u8 command) -{ - return (command & 0x60) =3D=3D 0x20; -} - -static inline int in_talk_address_group(__u8 command) -{ - return (command & 0x60) =3D=3D 0x40; -} - -static inline int in_primary_command_group(__u8 command) -{ - return in_addressed_command_group(command) || - in_universal_command_group(command) || - in_listen_address_group(command) || - in_talk_address_group(command); -} - -static inline int gpib_address_equal(unsigned int pad1, int sad1, unsigned= int pad2, int sad2) -{ - if (pad1 =3D=3D pad2) { - if (sad1 =3D=3D sad2) - return 1; - if (sad1 < 0 && sad2 < 0) - return 1; - } - - return 0; -} - -enum ibask_option { - IBA_PAD =3D 0x1, - IBA_SAD =3D 0x2, - IBA_TMO =3D 0x3, - IBA_EOT =3D 0x4, - IBA_PPC =3D 0x5, /* board only */ - IBA_READ_DR =3D 0x6, /* device only */ - IBA_AUTOPOLL =3D 0x7, /* board only */ - IBA_CICPROT =3D 0x8, /* board only */ - IBA_IRQ =3D 0x9, /* board only */ - IBA_SC =3D 0xa, /* board only */ - IBA_SRE =3D 0xb, /* board only */ - IBA_EOS_RD =3D 0xc, - IBA_EOS_WRT =3D 0xd, - IBA_EOS_CMP =3D 0xe, - IBA_EOS_CHAR =3D 0xf, - IBA_PP2 =3D 0x10, /* board only */ - IBA_TIMING =3D 0x11, /* board only */ - IBA_DMA =3D 0x12, /* board only */ - IBA_READ_ADJUST =3D 0x13, - IBA_WRITE_ADJUST =3D 0x14, - IBA_EVENT_QUEUE =3D 0x15, /* board only */ - IBA_SPOLL_BIT =3D 0x16, /* board only */ - IBA_SEND_LLO =3D 0x17, /* board only */ - IBA_SPOLL_TIME =3D 0x18, /* device only */ - IBA_PPOLL_TIME =3D 0x19, /* board only */ - IBA_END_BIT_IS_NORMAL =3D 0x1a, - IBA_UN_ADDR =3D 0x1b, /* device only */ - IBA_HS_CABLE_LENGTH =3D 0x1f, /* board only */ - IBA_IST =3D 0x20, /* board only */ - IBA_RSV =3D 0x21, /* board only */ - IBA_BNA =3D 0x200, /* device only */ - /* linux-gpib extensions */ - IBA_7_BIT_EOS =3D 0x1000 /* board only. Returns 1 if board supports 7 bit= eos compares*/ -}; - -enum ibconfig_option { - IBC_PAD =3D 0x1, - IBC_SAD =3D 0x2, - IBC_TMO =3D 0x3, - IBC_EOT =3D 0x4, - IBC_PPC =3D 0x5, /* board only */ - IBC_READDR =3D 0x6, /* device only */ - IBC_AUTOPOLL =3D 0x7, /* board only */ - IBC_CICPROT =3D 0x8, /* board only */ - IBC_IRQ =3D 0x9, /* board only */ - IBC_SC =3D 0xa, /* board only */ - IBC_SRE =3D 0xb, /* board only */ - IBC_EOS_RD =3D 0xc, - IBC_EOS_WRT =3D 0xd, - IBC_EOS_CMP =3D 0xe, - IBC_EOS_CHAR =3D 0xf, - IBC_PP2 =3D 0x10, /* board only */ - IBC_TIMING =3D 0x11, /* board only */ - IBC_DMA =3D 0x12, /* board only */ - IBC_READ_ADJUST =3D 0x13, - IBC_WRITE_ADJUST =3D 0x14, - IBC_EVENT_QUEUE =3D 0x15, /* board only */ - IBC_SPOLL_BIT =3D 0x16, /* board only */ - IBC_SEND_LLO =3D 0x17, /* board only */ - IBC_SPOLL_TIME =3D 0x18, /* device only */ - IBC_PPOLL_TIME =3D 0x19, /* board only */ - IBC_END_BIT_IS_NORMAL =3D 0x1a, - IBC_UN_ADDR =3D 0x1b, /* device only */ - IBC_HS_CABLE_LENGTH =3D 0x1f, /* board only */ - IBC_IST =3D 0x20, /* board only */ - IBC_RSV =3D 0x21, /* board only */ - IBC_BNA =3D 0x200 /* device only */ -}; - -enum t1_delays { - T1_DELAY_2000ns =3D 1, - T1_DELAY_500ns =3D 2, - T1_DELAY_350ns =3D 3 -}; - enum { request_service_bit =3D 0x40, }; @@ -292,11 +100,5 @@ enum gpib_events { EVENT_IFC =3D 3 }; =20 -enum gpib_stb { - IB_STB_RQS =3D 0x40, /* IEEE 488.1 & 2 */ - IB_STB_ESB =3D 0x20, /* IEEE 488.2 only */ - IB_STB_MAV =3D 0x10 /* IEEE 488.2 only */ -}; - #endif /* _GPIB_H */ =20 --=20 2.49.0 From nobody Sun Feb 8 00:18:42 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.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 2F8E8288CB9 for ; Tue, 3 Jun 2025 18:44:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748976243; cv=none; b=mB0plkkNYVURKhNQ3Be9AkTkNWO+ByoBTsFHkKvQutZhrl7fXFpzopFtonjWPU9iGbm1YuMQokVjY9ewFO+1aeM5Te5fmg11I8BgE3AJVso8gX6zv+mHsnYDWLswfEnRMzdJFhuThlqED9tR9kB4uFrP172mqTd9FuDLaTJ85ek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748976243; c=relaxed/simple; bh=BTKy6rwniCmZTgA6Z39+urHx80l/dpJ0s7iL3/6zO80=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JlSu/pymLlBG2VWQfTo8XtoSl8xYoUSKyJpEnpl9ycATVfqQNRuFAdqwz4VdKTuVwMG7I1b4DaYUqCk6dc3cQLG5no9Amg2kKxn8Uvyqq/o2SzdBsyFUd8+ZO42eZkLz0jOttcSKCXpF+LZ/BEPI1hUIRFhZqJcdfLrhER56bkc= 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=Q1Y0oH/7; arc=none smtp.client-ip=209.85.128.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="Q1Y0oH/7" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-442fda876a6so53518715e9.0 for ; Tue, 03 Jun 2025 11:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748976239; x=1749581039; 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=59qNnoC0PZCUiRqcfCTJ4/Iv3mXqvFEjwoviJeNS6GU=; b=Q1Y0oH/7oCz6QKclxJ4tCzkRboCDNsQ2ebzUg2SkkPXyrNq8v1gAbHFj6ydQpwceQD iPmdzM30lPfMdbVv+/qb94PqK1D3ly9r5Z+ZFsV9KiDZ0QwtgwRpKSv2Z/eu+T5ZMT37 K0Lpkbk14Tr9aCBXpjxvq4X/gncgfLjXSeWvlBXRSmu/t8d9mAM1Cobw2FY8l4dvSved hEpQHun/kuomppTH0tl63TWmuciMx6dew0XYImINHCfK2IpoyOcbXWEuetmQVwpZcbnH KYyJXKohkeQNOYOMHuWW2m2RQBreHVBBYfOq8JPFJ7++aIMYbFHXM1KvGtdrm7O7bEl2 Sipg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748976239; x=1749581039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=59qNnoC0PZCUiRqcfCTJ4/Iv3mXqvFEjwoviJeNS6GU=; b=iC5DRyfmMJsGCcHS1F2DsbVsxaBVxafS4zXMtGyVnX/oZIWi5x0NmZah4WEjatQPt4 GpAoQvT3JwXiJjKbfAcywQ8FAELklL5UKTtd4JcBlUYUXalHSf8F4QirypaxT2cr6s53 L0DMUHkAt6X+yIB0fVVN1t2mXHEFI30Zs5N538yGY0sln1oOSv354+AvjFzdlM1XVbiG ja2asdvW5LjGpxDZJt6Jp7BAiCWVqb8sBe4I0yT+ib+muIr7q0bUlFDk+HWgBYwFGidX gETexancStVSIF6OFRYONerj1wh3e2NbqQGhzCSHdlw5EnVEcgdOSjV2jBaNY/cVzT20 XSgw== X-Forwarded-Encrypted: i=1; AJvYcCWVhd9OBfsyzrkI2q1IHm5ryMpzvDv/C2pVL4ovOrXGeBjDnHG6uZxH159EHT79kk/BaTvIDNhDXlXmcx0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3OIngpmRpvKQakAYR5ckD9NmEXe8F9dtPQ7UKATOHJjZeRWzf TBDl+bCMpIEFS9xjInuM0Sic/EprfT7LQHAWfzumY7mgtqWAvTvxvyvW X-Gm-Gg: ASbGncvnbN806DgCvyH65XoLJvxQn8/DdG9WDimmYSbSDtFZKUUBhwqKh3saNrYKyYM DF1Hk2cCH2nnJu4wmul7X3e3XTviId6JFRRSbkbSFLixDQ3fviowZaxMmGRMO48Sjg+RNKhApUb igezy6tmAcg/CBsKjqGHT8ORPTb0+T+pwNXRzeOj3/MsSCl3gmV46JIlYQJ9zlGGk2nNXo9PbBn H5M46ypC4hvMtgrxly2CT8yJwc71g9aF0n04XDDpmot8aPzDkCAoam3IQp8tB26Ey8X+TPMuDyf Bv28egZPLcXFOPArlnQxb568kCW2pZCiDXNHSnErNFPE57t04lHnBRc25NiqZyEO3y81oBcVJS/ 1i2gnDCUXr1c= X-Google-Smtp-Source: AGHT+IFnATrJDqDfVpdsS2vtesr8sPjEo8vJu41t/gzywoAWihVtY+HSNGfLyfB4D8RIIV9M5t1LWg== X-Received: by 2002:a7b:c048:0:b0:450:c9e3:995c with SMTP id 5b1f17b1804b1-451e2173e0emr42217685e9.12.1748976239019; Tue, 03 Jun 2025 11:43:59 -0700 (PDT) Received: from localhost.localdomain (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4efe73f83sm18449959f8f.49.2025.06.03.11.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jun 2025 11:43:58 -0700 (PDT) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 2/4] staging: gpib: Add local include file for commands Date: Tue, 3 Jun 2025 20:43:18 +0200 Message-ID: <20250603184320.30594-3-dpenkler@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603184320.30594-1-dpenkler@gmail.com> References: <20250603184320.30594-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" Add the functions and enums needed only by the kernel drivers that were removed from the uapi/gpib.h include file to a separate local include file. Include this new file in the gpibP.h local include file. Signed-off-by: Dave Penkler --- drivers/staging/gpib/include/gpibP.h | 1 + drivers/staging/gpib/include/gpib_cmd.h | 112 ++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 drivers/staging/gpib/include/gpib_cmd.h diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/staging/gpib/in= clude/gpibP.h index 0af72934ce24..1b27f37e0ba0 100644 --- a/drivers/staging/gpib/include/gpibP.h +++ b/drivers/staging/gpib/include/gpibP.h @@ -11,6 +11,7 @@ =20 #include "gpib_types.h" #include "gpib_proto.h" +#include "gpib_cmd.h" #include "gpib.h" #include "gpib_ioctl.h" =20 diff --git a/drivers/staging/gpib/include/gpib_cmd.h b/drivers/staging/gpib= /include/gpib_cmd.h new file mode 100644 index 000000000000..9e96a3bfa22d --- /dev/null +++ b/drivers/staging/gpib/include/gpib_cmd.h @@ -0,0 +1,112 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _GPIB_CMD_H +#define _GPIB_CMD_H + +#include + +/* Command byte definitions tests and functions */ + +/* mask of bits that actually matter in a command byte */ +enum { + gpib_command_mask =3D 0x7f, +}; + +/* Possible GPIB command messages */ + +enum cmd_byte { + GTL =3D 0x1, /* go to local */ + SDC =3D 0x4, /* selected device clear */ + PP_CONFIG =3D 0x5, + GET =3D 0x8, /* group execute trigger */ + TCT =3D 0x9, /* take control */ + LLO =3D 0x11, /* local lockout */ + DCL =3D 0x14, /* device clear */ + PPU =3D 0x15, /* parallel poll unconfigure */ + SPE =3D 0x18, /* serial poll enable */ + SPD =3D 0x19, /* serial poll disable */ + CFE =3D 0x1f, /* configure enable */ + LAD =3D 0x20, /* value to be 'ored' in to obtain listen address */ + UNL =3D 0x3F, /* unlisten */ + TAD =3D 0x40, /* value to be 'ored' in to obtain talk address */ + UNT =3D 0x5F, /* untalk */ + SAD =3D 0x60, /* my secondary address (base) */ + PPE =3D 0x60, /* parallel poll enable (base) */ + PPD =3D 0x70 /* parallel poll disable */ +}; + +/* confine address to range 0 to 30. */ +static inline unsigned int gpib_address_restrict(u32 addr) +{ + addr &=3D 0x1f; + if (addr =3D=3D 0x1f) + addr =3D 0; + return addr; +} + +static inline u8 MLA(u32 addr) +{ + return gpib_address_restrict(addr) | LAD; +} + +static inline u8 MTA(u32 addr) +{ + return gpib_address_restrict(addr) | TAD; +} + +static inline u8 MSA(u32 addr) +{ + return (addr & 0x1f) | SAD; +} + +static inline s32 gpib_address_equal(u32 pad1, s32 sad1, u32 pad2, s32 sad= 2) +{ + if (pad1 =3D=3D pad2) { + if (sad1 =3D=3D sad2) + return 1; + if (sad1 < 0 && sad2 < 0) + return 1; + } + + return 0; +} + +static inline s32 is_PPE(u8 command) +{ + return (command & 0x70) =3D=3D 0x60; +} + +static inline s32 is_PPD(u8 command) +{ + return (command & 0x70) =3D=3D 0x70; +} + +static inline s32 in_addressed_command_group(u8 command) +{ + return (command & 0x70) =3D=3D 0x0; +} + +static inline s32 in_universal_command_group(u8 command) +{ + return (command & 0x70) =3D=3D 0x10; +} + +static inline s32 in_listen_address_group(u8 command) +{ + return (command & 0x60) =3D=3D 0x20; +} + +static inline s32 in_talk_address_group(u8 command) +{ + return (command & 0x60) =3D=3D 0x40; +} + +static inline s32 in_primary_command_group(u8 command) +{ + return in_addressed_command_group(command) || + in_universal_command_group(command) || + in_listen_address_group(command) || + in_talk_address_group(command); +} + +#endif /* _GPIB_CMD_H */ --=20 2.49.0 From nobody Sun Feb 8 00:18:42 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 5067328934A for ; Tue, 3 Jun 2025 18:44:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748976248; cv=none; b=cJvDa6LmUsJTbdW3e3p5tSVTkMSm9IOX0sjetmm69X1LGGNaO91R3SOCOb1r5/0nirYloZU3TsSFs3NWLe60NVJZk7oxhXOenSzTBJOtFtX2zueW2hPFh2RmWDR3IBQjKS/FDVMATDHuzEE8f7SwmfZYvdawdJZ5S66JmRT6Ths= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748976248; c=relaxed/simple; bh=yPesDnhB9t5yVMCCj6DKkbOKpQJNQFkvzUbwNjyUwFE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E6HobQeDWbOjpXBxJdelkTIYDu8k8pZVkbydLqHxQRaS34vk1ZTTXEFicwNenSA/Aw9lE8MhifRkb5tQIixFc02cI71Efho7DbkQLRFyh/gq7T4HtuL90DBBYSfF9wIEYylNskDZvJxNoQXQ+DRj/YQFfpV89kphymqshzMsLsQ= 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=PPDs2le7; arc=none smtp.client-ip=209.85.221.50 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="PPDs2le7" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-3a50fc7ac4dso1392295f8f.0 for ; Tue, 03 Jun 2025 11:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748976244; x=1749581044; 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=iHcQIzbO8vErc+yJtqA1zwASX4NEt6ytpvqXfDCS3ds=; b=PPDs2le7vdjoSK/1wjZfV6TspmIv1wr22tlamYINuiRFzPvhXJYmVcqes5HEUpwM4o HguVehjnwacaOOdfcVBRyChBty3iTaXYsT2ni2nPvf8AgzgQp6j4nUVwL4k+h1C2NGcW mOUy8NzdBcibiLvAxKTHlm9aCxWIziN9LvTIdphbeHrjH5t84fK+JwdjlCz+901OFtvT 4OTdqoiXL4Q3leMD0eXoBNJ2c07tl0VGjPM4dpa3zxyNSH2QJNNrb26pWiUreu4XwN6d CeW3tvhxP+EtFQ3uX5OfhULNo1/NchGwMI74nvF/L5Cz+w8TrEPApZ8jb/WhMIxbsCv1 u+Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748976244; x=1749581044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iHcQIzbO8vErc+yJtqA1zwASX4NEt6ytpvqXfDCS3ds=; b=EEWWQTSryDHKx87SJfwYU8KU0QruTZnzzGVxLQXnt4SdEtnCengLLWNDbp0qDCkwDK P7Ohnpe+iT/U2MGF4gvQo8dumBaNdnvFBVd8vFiU/ad18Qnm8rj0iWYLXm9ScXzdmuUq MEqDDfyBhH35pU8KABbqp4AF105kV63u8lhYcuzOND5GUIp5nRhUOmYWSA7iq78/2PYA Dj38qb1LPATdlL9kOj31LNh3wkH/uo7QIp+ANiC4N6MZ86zP7QqJ1i++XyP2Flm0lL+n dx0bS0w/cXMY9p8xDNXmSbyxXu0TThlr9DA6qIWLuR+Qb9XYkiEyRLqtGbC4pEGrvCp8 hxew== X-Forwarded-Encrypted: i=1; AJvYcCUD5Q/1tetNztLnG99cFvxxbCDT5uLnH4Hoa6UzmR7YkG6HUulDIq3bLK8NkN2uI/ORyqpQfaMPMyBEpxI=@vger.kernel.org X-Gm-Message-State: AOJu0YxZaP9XP40W7C3pIA3tz6YWTktIl6jmni30ffgUGy66nxS9TlB8 cMVnekJiJv1fYvvFJDMxydKZkZKRsEeXrKd0uGxq7BjZ4Q4RGVaRb5hhCZI1Yw== X-Gm-Gg: ASbGncvn/hxfvTgo/5ZUGUW5ftmmGJMCh7avUuZ4K63kto3SORX0E5zqfQW+WWmWQg7 Fm7BXWBHxO4qzAV2fG34l/492roXaG64vd41PnQO+8yHhn8V4jdyEjhR02Q7gYd8i6XlBLcEwlO yN7+Pj7bWFxZ3uXYKTU098haGY5RP9llDog7rltcYDma0FUro9SOcZLDWjXQm+XQhpLmu2Pw79G r6LHT0G/7Ph2k67ZIWfIwGZfU5ju+r9YGQY5fV5hKIdtlUi2oI068QNk2dczMkZrzQTtmCheji3 B0zy8sJdN+NYwLivfM0u3G2MqKZm6bw2O6d967cY4HI1fOugqlQT/ydM1r7EZ9SHjkjV1P/UhIs AQkFA9MZhZ0E= X-Google-Smtp-Source: AGHT+IG8RYYFqv2zCyGW60oYb4bDuCDm3BVjHRqREoqS7uHzhn1Vs+5KcEjOWDpFdSFBlBrsiQv6Tg== X-Received: by 2002:a05:6000:2910:b0:3a5:1cc5:aa6f with SMTP id ffacd0b85a97d-3a51cc5aa90mr415146f8f.34.1748976244478; Tue, 03 Jun 2025 11:44:04 -0700 (PDT) Received: from localhost.localdomain (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4efe73f83sm18449959f8f.49.2025.06.03.11.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jun 2025 11:44:03 -0700 (PDT) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 3/4] staging: gpib: Use standard size basic uapi types Date: Tue, 3 Jun 2025 20:43:19 +0200 Message-ID: <20250603184320.30594-4-dpenkler@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603184320.30594-1-dpenkler@gmail.com> References: <20250603184320.30594-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" Change unsigned int to __u32, int to __s32 and short to __s16 Signed-off-by: Dave Penkler --- drivers/staging/gpib/uapi/gpib_ioctl.h | 106 ++++++++++++------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/drivers/staging/gpib/= uapi/gpib_ioctl.h index 0fed5c0fa7f2..0da47e28caaa 100644 --- a/drivers/staging/gpib/uapi/gpib_ioctl.h +++ b/drivers/staging/gpib/uapi/gpib_ioctl.h @@ -19,71 +19,71 @@ struct gpib_board_type_ioctl { /* argument for read/write/command ioctls */ struct gpib_read_write_ioctl { __u64 buffer_ptr; - unsigned int requested_transfer_count; - unsigned int completed_transfer_count; - int end; /* end flag return for reads, end io suppression request for cmd= */ - int handle; + __u32 requested_transfer_count; + __u32 completed_transfer_count; + __s32 end; /* end flag return for reads, end io suppression request for c= md*/ + __s32 handle; }; =20 struct gpib_open_dev_ioctl { - unsigned int handle; - unsigned int pad; - int sad; + __u32 handle; + __u32 pad; + __s32 sad; unsigned is_board : 1; }; =20 struct gpib_close_dev_ioctl { - unsigned int handle; + __u32 handle; }; =20 struct gpib_serial_poll_ioctl { - unsigned int pad; - int sad; + __u32 pad; + __s32 sad; __u8 status_byte; }; =20 struct gpib_eos_ioctl { - int eos; - int eos_flags; + __s32 eos; + __s32 eos_flags; }; =20 struct gpib_wait_ioctl { - int handle; - int wait_mask; - int clear_mask; - int set_mask; - int ibsta; - int pad; - int sad; - unsigned int usec_timeout; + __s32 handle; + __s32 wait_mask; + __s32 clear_mask; + __s32 set_mask; + __s32 ibsta; + __s32 pad; + __s32 sad; + __u32 usec_timeout; }; =20 struct gpib_online_ioctl { __u64 init_data_ptr; - int init_data_length; - int online; + __s32 init_data_length; + __s32 online; }; =20 struct gpib_spoll_bytes_ioctl { - unsigned int num_bytes; - unsigned int pad; - int sad; + __u32 num_bytes; + __u32 pad; + __s32 sad; }; =20 struct gpib_board_info_ioctl { - unsigned int pad; - int sad; - int parallel_poll_configuration; - int autopolling; - int is_system_controller; - unsigned int t1_delay; + __u32 pad; + __s32 sad; + __s32 parallel_poll_configuration; + __s32 autopolling; + __s32 is_system_controller; + __u32 t1_delay; unsigned ist : 1; unsigned no_7_bit_eos : 1; }; =20 struct gpib_select_pci_ioctl { - int pci_bus; - int pci_slot; + __s32 pci_bus; + __s32 pci_slot; }; =20 struct gpib_ppoll_config_ioctl { @@ -93,13 +93,13 @@ struct gpib_ppoll_config_ioctl { }; =20 struct gpib_pad_ioctl { - unsigned int handle; - unsigned int pad; + __u32 handle; + __u32 pad; }; =20 struct gpib_sad_ioctl { - unsigned int handle; - int sad; + __u32 handle; + __s32 sad; }; =20 // select a piece of hardware to attach by its sysfs device path @@ -110,7 +110,7 @@ struct gpib_select_device_path_ioctl { // update status byte and request service struct gpib_request_service2 { __u8 status_byte; - int new_reason_for_service; + __s32 new_reason_for_service; }; =20 /* Standard functions. */ @@ -123,38 +123,38 @@ enum gpib_ioctl { IBWAIT =3D _IOWR(GPIB_CODE, 5, struct gpib_wait_ioctl), IBRPP =3D _IOWR(GPIB_CODE, 6, __u8), =20 - IBSIC =3D _IOW(GPIB_CODE, 9, unsigned int), - IBSRE =3D _IOW(GPIB_CODE, 10, int), + IBSIC =3D _IOW(GPIB_CODE, 9, __u32), + IBSRE =3D _IOW(GPIB_CODE, 10, __s32), IBGTS =3D _IO(GPIB_CODE, 11), - IBCAC =3D _IOW(GPIB_CODE, 12, int), - IBLINES =3D _IOR(GPIB_CODE, 14, short), + IBCAC =3D _IOW(GPIB_CODE, 12, __s32), + IBLINES =3D _IOR(GPIB_CODE, 14, __s16), IBPAD =3D _IOW(GPIB_CODE, 15, struct gpib_pad_ioctl), IBSAD =3D _IOW(GPIB_CODE, 16, struct gpib_sad_ioctl), - IBTMO =3D _IOW(GPIB_CODE, 17, unsigned int), + IBTMO =3D _IOW(GPIB_CODE, 17, __u32), IBRSP =3D _IOWR(GPIB_CODE, 18, struct gpib_serial_poll_ioctl), IBEOS =3D _IOW(GPIB_CODE, 19, struct gpib_eos_ioctl), IBRSV =3D _IOW(GPIB_CODE, 20, __u8), CFCBASE =3D _IOW(GPIB_CODE, 21, __u64), - CFCIRQ =3D _IOW(GPIB_CODE, 22, unsigned int), - CFCDMA =3D _IOW(GPIB_CODE, 23, unsigned int), + CFCIRQ =3D _IOW(GPIB_CODE, 22, __u32), + CFCDMA =3D _IOW(GPIB_CODE, 23, __u32), CFCBOARDTYPE =3D _IOW(GPIB_CODE, 24, struct gpib_board_type_ioctl), =20 - IBMUTEX =3D _IOW(GPIB_CODE, 26, int), + IBMUTEX =3D _IOW(GPIB_CODE, 26, __s32), IBSPOLL_BYTES =3D _IOWR(GPIB_CODE, 27, struct gpib_spoll_bytes_ioctl), IBPPC =3D _IOW(GPIB_CODE, 28, struct gpib_ppoll_config_ioctl), IBBOARD_INFO =3D _IOR(GPIB_CODE, 29, struct gpib_board_info_ioctl), =20 - IBQUERY_BOARD_RSV =3D _IOR(GPIB_CODE, 31, int), + IBQUERY_BOARD_RSV =3D _IOR(GPIB_CODE, 31, __s32), IBSELECT_PCI =3D _IOWR(GPIB_CODE, 32, struct gpib_select_pci_ioctl), - IBEVENT =3D _IOR(GPIB_CODE, 33, short), - IBRSC =3D _IOW(GPIB_CODE, 34, int), - IB_T1_DELAY =3D _IOW(GPIB_CODE, 35, unsigned int), + IBEVENT =3D _IOR(GPIB_CODE, 33, __s16), + IBRSC =3D _IOW(GPIB_CODE, 34, __s32), + IB_T1_DELAY =3D _IOW(GPIB_CODE, 35, __u32), IBLOC =3D _IO(GPIB_CODE, 36), =20 - IBAUTOSPOLL =3D _IOW(GPIB_CODE, 38, short), + IBAUTOSPOLL =3D _IOW(GPIB_CODE, 38, __s16), IBONL =3D _IOW(GPIB_CODE, 39, struct gpib_online_ioctl), - IBPP2_SET =3D _IOW(GPIB_CODE, 40, short), - IBPP2_GET =3D _IOR(GPIB_CODE, 41, short), + 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 IBRSV2 =3D _IOW(GPIB_CODE, 45, struct gpib_request_service2) --=20 2.49.0 From nobody Sun Feb 8 00:18:42 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 9B263289832 for ; Tue, 3 Jun 2025 18:44:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748976251; cv=none; b=M8eFqAJuFNrQdFjkE2bbENIjBjXbyRklMvSKi+HIGORXQr/RJ69ZKUP8CyBBqFZOMRPPaBMiX6cXLpxMseMpSCWOyfgQQg+7xfI+bBChZaegJQ6HWpGHeqAfcYryZN3ODxpKR+yxNruGV8IiL9bjLjq1pWLSOnmBFbSlu0qXFS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748976251; c=relaxed/simple; bh=cs0d62jUhTsQ4M0UtMJEMQnYLyBLCUuZP7GJM7VZ4Mc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j4XLb3kFTUmNOGFzdtQjIHLtzND+4z+bavmyyQB3TH1R7tGkVkIZKpxld1xpTk1R/UD0VTnjPBTyMWz0WQb4xilKzVHEqGGJLCTU4MEb/AnvAO+tA57gv2XfDESJl7uXZ6vd8qjTyieTm8XFNFhSmURl5qhy/4Pp2ZiMcJ+ra4I= 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=h6P2mhWF; arc=none smtp.client-ip=209.85.221.53 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="h6P2mhWF" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3a3758b122cso3977997f8f.1 for ; Tue, 03 Jun 2025 11:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748976248; x=1749581048; 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=B9FZ5oqjuv5Ikr1VhUnEUNb3J4Oy/+PaHPwc/4HpVkQ=; b=h6P2mhWFj/Wh14JvoZTqlDsCRl0yLer1qZTqY6mO5NvHagL5CMrB7GUEXfKtVo4OHo eTYz4eqvuL1KPoZ4X/HyGXd+YHoduUYf2+dh4T9cCTw+jtunGCwAXrrYr2p9HMV8hJDL 2B5TyWQNt/62hNETkPA+kSiRvuhAEBi4EEZk+8mXlJAoM/9s3Ks4qyX82tkfQtP5+eai sL0RvQRKHaRHgQ5YGtAFusGMv7/2Vrg25IdJu9LnCMURq+dxaYPUV9q+//6a1HxhMDAT 0hUfkRcsSilxJ7tlLl1ReaKjMiq2kcIgcZ8MGBRLKvaJuUQqZNhX0o/SyoLo+ja29mLm 00ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748976248; x=1749581048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B9FZ5oqjuv5Ikr1VhUnEUNb3J4Oy/+PaHPwc/4HpVkQ=; b=AMKttGj9noy5sEaWdmGddaQYl3EMKLp2s58s6vkbuZQPMxRaAPVwEyb4HfQtCQGSr0 82TBIHVjSjFeZqXi3+AXY6E9yDKlEzsf6VLIJp0FY2Io/aVHpeq+0yD30wDRWFXNXLWy mQ40w+slPqxOlFupWrjt5aKiANb8jKCN7cYz+v+bpTKZJYVnXqAWdxuemtFaFHYHrmPj HthWjjVZHQQzy8IRqvVBbK0bU9rfXpQ5v8sNnVOC78nMslq64igyWclvJquESwYd1m4t dsEPe27xmdkrgGYAAuDgq1D8T/Qfr4pEDd2ZYgSkTr4wF43XvL3lQiFzJC6bL4gXwB5f rl8w== X-Forwarded-Encrypted: i=1; AJvYcCXS0f452tLjofDODGp4pVJqGHBZSw9Pqykzs3D1HfPr3HZDRUr+lnHbsyvzUocpi6fBLmYHOv+geJYxCPk=@vger.kernel.org X-Gm-Message-State: AOJu0YyZ8i4DlhenfLaXEXRRAChsmtc2dMsrUMIakhPWOCPw3s0Q7Z+y e3AoL9YIlff3y2uVFWpmme+BBIp9yGUnXVnBxfjnIfNT/XaH/r3EGFLl X-Gm-Gg: ASbGnctZM26oNYGyeOoEuJcWDcmcvCXDseNlJ0VIC1Ea7+LXAe1E7dycVkfvnfc1Au5 raD2i58m4BlA5OQNDoyaH+CWvXfw5SZ7V76SarnvQFCowK3KXGO2/5Zec0Hq/Z9CJZFK0nnuetR Ph6hBXhhT3lp4S59pZg/+PAnuX+ufQDYHsiKhhKKHxkR+1EfEwcfyjSBPHTEeNujauc2GakkzDp F7p0mo35OytULegg6w3vCmDIA5XFLa7Czhx+xbuEbiD6i5rQ0IsoSO/m79uiEPnbQFMbo8nLNPd 5IK4DKT5jNv86MLfzw0t2o8SVd+Bzl5zdss05MVDtBYBd2d4QuHp+66wJgIMqvByrs8KW4XnSeu SoZy/D0W//hU= X-Google-Smtp-Source: AGHT+IF5Hwuvnc/0J0y8rHsrGxR6kUfr4vat5I1FdEtpqaq/YMu7JxaNXcvi1U8W2zY7/o/ig/bjaw== X-Received: by 2002:a05:6000:2089:b0:3a4:e68c:beeb with SMTP id ffacd0b85a97d-3a4f7a4d34dmr12758179f8f.22.1748976247866; Tue, 03 Jun 2025 11:44:07 -0700 (PDT) Received: from localhost.localdomain (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4efe73f83sm18449959f8f.49.2025.06.03.11.44.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jun 2025 11:44:07 -0700 (PDT) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 4/4] staging: gpib: Add bit and byte padding to ioctl structs Date: Tue, 3 Jun 2025 20:43:20 +0200 Message-ID: <20250603184320.30594-5-dpenkler@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603184320.30594-1-dpenkler@gmail.com> References: <20250603184320.30594-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" Ensure that all structs have a size that is an integral mutliple of 32 bits. Change trailing single bit field to __u32 in gpib_open_dev_ioctl Add byte padding to gpib_serial_poll_ioctl and gpib_request_service2 Add bit padding to gpib_board_info_ioctl and gpib_ppoll_config_ioctl Signed-off-by: Dave Penkler --- drivers/staging/gpib/uapi/gpib_ioctl.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/drivers/staging/gpib/= uapi/gpib_ioctl.h index 0da47e28caaa..55bf5e55507a 100644 --- a/drivers/staging/gpib/uapi/gpib_ioctl.h +++ b/drivers/staging/gpib/uapi/gpib_ioctl.h @@ -29,7 +29,7 @@ struct gpib_open_dev_ioctl { __u32 handle; __u32 pad; __s32 sad; - unsigned is_board : 1; + __u32 is_board; }; =20 struct gpib_close_dev_ioctl { @@ -40,6 +40,7 @@ struct gpib_serial_poll_ioctl { __u32 pad; __s32 sad; __u8 status_byte; + __u8 padding[3]; // align to 32 bit boundary }; =20 struct gpib_eos_ioctl { @@ -79,6 +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 }; =20 struct gpib_select_pci_ioctl { @@ -90,6 +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 }; =20 struct gpib_pad_ioctl { @@ -110,6 +113,7 @@ struct gpib_select_device_path_ioctl { // update status byte and request service struct gpib_request_service2 { __u8 status_byte; + __u8 padding[3]; // align to 32 bit boundary __s32 new_reason_for_service; }; =20 --=20 2.49.0