Removing CFGn since it is not called by kernel code nor any of the gpib
drivers.

Signed-off-by: Michael Rubin <matchstick@neverthere.org>
---
 drivers/staging/gpib/uapi/gpib_user.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/staging/gpib/uapi/gpib_user.h b/drivers/staging/gpib/uapi/gpib_user.h
index eaf7399a164a..1cb6b6219e67 100644
--- a/drivers/staging/gpib/uapi/gpib_user.h
+++ b/drivers/staging/gpib/uapi/gpib_user.h
@@ -192,11 +192,6 @@ static inline __u8 PPE_byte(unsigned int dio_line, int sense)
 	return cmd;
 }
 
-static inline __u8 CFGn(unsigned int meters)
-{
-	return 0x6 | (meters & 0xf);
-}
-
 /* mask of bits that actually matter in a command byte */
 enum {
 	gpib_command_mask = 0x7f,
-- 
2.43.0

On Wed, Apr 09, 2025 at 06:18:09PM +0000, Michael Rubin wrote:
> Removing CFGn since it is not called by kernel code nor any of the gpib
> drivers.
> 
> Signed-off-by: Michael Rubin <matchstick@neverthere.org>
> ---
>  drivers/staging/gpib/uapi/gpib_user.h | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/drivers/staging/gpib/uapi/gpib_user.h b/drivers/staging/gpib/uapi/gpib_user.h
> index eaf7399a164a..1cb6b6219e67 100644
> --- a/drivers/staging/gpib/uapi/gpib_user.h
> +++ b/drivers/staging/gpib/uapi/gpib_user.h
> @@ -192,11 +192,6 @@ static inline __u8 PPE_byte(unsigned int dio_line, int sense)
>  	return cmd;
>  }
>  
> -static inline __u8 CFGn(unsigned int meters)
> -{
> -	return 0x6 | (meters & 0xf);
> -}
> -
>  /* mask of bits that actually matter in a command byte */
>  enum {
>  	gpib_command_mask = 0x7f,
> -- 
> 2.43.0
> 
> 

Already in my tree?  I'm confused, this didn't apply at all.

thanks,

greg k-h

On Tue, Apr 15, 2025 at 04:47:34PM +0200, Greg KH wrote:
> On Wed, Apr 09, 2025 at 06:18:09PM +0000, Michael Rubin wrote:
> Already in my tree?  I'm confused, this didn't apply at all.

Sorry for the hassle here. I will be keeping my tree much closer to yours
going forward.

I just did a comparison of your tree and mine with the following commands:

$ git fetch origin
$ git rebase origin/staging-testing
Current branch work-next is up to date.
$ git log --oneline origin/staging-testing..HEAD
01bb7ebee650 (HEAD -> work-next) staging: gpib: tnt4882: u8 over uint8_t
b362526c049a staging: gpib: lpvo_usb_gpib: u8 over uint8_t
c0086ac9f8c6 staging: gpib: gpib_ioctl: u64 over uint64_t
dfde322a6458 staging: gpib: pc2: u8 over uint8_t
0d68978f157c staging: gpib: ni_usb: u8 over uint8_t
6c1d83dae00e staging: gpib: hp_82341: u8 over uint8_t
6e47dd2b355e staging: gpib: hp_82335: u8 over uint8_t
066df8151ebc staging: gpib: gpib_bitbang: u8 over uint8_t
e2f98401b6cc staging: gpib: gpib_os: u8 over uint8_t
d39283e31564 staging: gpib: cec: u8 over uint8_t
76ca6178f5ac staging: gpib: agilent_82357a: u8 over uint8_t
83a4047b9a77 staging: gpib: agilent_82350b: u8 over uint8_t
e3e09b3c0b18 staging: gpib: gpib_user: u8 over uint8_t
7de94cbc8071 staging: gpib: gpib_ioctl: u8 over uint8_t
98b2ae8ac973 staging: gpib: Removing typedef gpib_interface_t
9d1d6dfa3871 staging: gpib: tnt4882: struct gpib_interface
914975f8fc96 staging: gpib: pc2: struct gpib_interface
64c745a7adb7 staging: gpib: ni_usb: struct gpib_interface
c303323266fe staging: gpib: lpvo_usb: struct gpib_interface
576eb9e6c1fa staging: gpib: ines: struct gpib_interface
5f2fb6ca422e staging: gpib: gpibP: struct gpib_interface
0033454014c8 staging: gpib: hp2341: struct gpib_interface
b1ab383f5d09 staging: gpib: hp_82335: struct gpib_interface
41ebb7c070bf staging: gpib: gpio: struct gpib_interface
ef391db774c0 staging: gpib: fmh: struct gpib_interface
701c5a45b91a staging: gpib: fluke: struct gpib_interface
88d5e0847f06 staging: gpib: common: struct gpib_interface
77b611bf3468 staging: gpib: cec: struct gpib_interface
803d5bfacf86 staging: gpib: cb7210: struct gpib_interface
294e66a9b7bc staging: gpib: agilent_82357a: gpib_interface
6eafa79e636a staging: gpib: agilent_82350b: gpib_interface
7a309862d53f staging: gpib: struct typing for gpib_interface
b248b9d75062 staging: gpib: uapi: Fix CamelCase and IBA Dup
$

I sent over the following series:

1) v2: u8 and u64 remaining patches

2) v3: the gpib_interface_t series (I broke the tree with v2).

3) The IBA Camel Case patch.

See if you can apply the CFGn patch after all the clean up. Not sure why that
does not apply cleanly. It does in my tree right now after the sync and rebase.

Michael Rubin

When th

On Thu, Apr 17, 2025 at 12:57:09AM +0000, Michael Rubin wrote:
> On Tue, Apr 15, 2025 at 04:47:34PM +0200, Greg KH wrote:
> > On Wed, Apr 09, 2025 at 06:18:09PM +0000, Michael Rubin wrote:
> > Already in my tree?  I'm confused, this didn't apply at all.
> 
> Sorry for the hassle here. I will be keeping my tree much closer to yours
> going forward.
> 
> I just did a comparison of your tree and mine with the following commands:
> 
> $ git fetch origin
> $ git rebase origin/staging-testing
> Current branch work-next is up to date.
> $ git log --oneline origin/staging-testing..HEAD
> 01bb7ebee650 (HEAD -> work-next) staging: gpib: tnt4882: u8 over uint8_t
> b362526c049a staging: gpib: lpvo_usb_gpib: u8 over uint8_t
> c0086ac9f8c6 staging: gpib: gpib_ioctl: u64 over uint64_t
> dfde322a6458 staging: gpib: pc2: u8 over uint8_t
> 0d68978f157c staging: gpib: ni_usb: u8 over uint8_t
> 6c1d83dae00e staging: gpib: hp_82341: u8 over uint8_t
> 6e47dd2b355e staging: gpib: hp_82335: u8 over uint8_t
> 066df8151ebc staging: gpib: gpib_bitbang: u8 over uint8_t
> e2f98401b6cc staging: gpib: gpib_os: u8 over uint8_t
> d39283e31564 staging: gpib: cec: u8 over uint8_t
> 76ca6178f5ac staging: gpib: agilent_82357a: u8 over uint8_t
> 83a4047b9a77 staging: gpib: agilent_82350b: u8 over uint8_t
> e3e09b3c0b18 staging: gpib: gpib_user: u8 over uint8_t
> 7de94cbc8071 staging: gpib: gpib_ioctl: u8 over uint8_t
> 98b2ae8ac973 staging: gpib: Removing typedef gpib_interface_t
> 9d1d6dfa3871 staging: gpib: tnt4882: struct gpib_interface
> 914975f8fc96 staging: gpib: pc2: struct gpib_interface
> 64c745a7adb7 staging: gpib: ni_usb: struct gpib_interface
> c303323266fe staging: gpib: lpvo_usb: struct gpib_interface
> 576eb9e6c1fa staging: gpib: ines: struct gpib_interface
> 5f2fb6ca422e staging: gpib: gpibP: struct gpib_interface
> 0033454014c8 staging: gpib: hp2341: struct gpib_interface
> b1ab383f5d09 staging: gpib: hp_82335: struct gpib_interface
> 41ebb7c070bf staging: gpib: gpio: struct gpib_interface
> ef391db774c0 staging: gpib: fmh: struct gpib_interface
> 701c5a45b91a staging: gpib: fluke: struct gpib_interface
> 88d5e0847f06 staging: gpib: common: struct gpib_interface
> 77b611bf3468 staging: gpib: cec: struct gpib_interface
> 803d5bfacf86 staging: gpib: cb7210: struct gpib_interface
> 294e66a9b7bc staging: gpib: agilent_82357a: gpib_interface
> 6eafa79e636a staging: gpib: agilent_82350b: gpib_interface
> 7a309862d53f staging: gpib: struct typing for gpib_interface
> b248b9d75062 staging: gpib: uapi: Fix CamelCase and IBA Dup
> $
> 
> I sent over the following series:
> 
> 1) v2: u8 and u64 remaining patches
> 
> 2) v3: the gpib_interface_t series (I broke the tree with v2).
> 
> 3) The IBA Camel Case patch.

I've taken all of these now, thanks!

> See if you can apply the CFGn patch after all the clean up. Not sure why that
> does not apply cleanly. It does in my tree right now after the sync and rebase.

Can you resend the CFGn patch, it's long-gone from my patch review
queue.

After that, I think I'm caught up, right?

thanks,

greg k-h