From: Michael Rubin Date: Wed, 9 Apr 2025 05:59:00 +0000 (+0000) Subject: staging: gpib: rsc_ioctl_t now int X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6856bb17cf6fe0007f66c61280def9c00db71869;p=users%2Fdwmw2%2Flinux.git staging: gpib: rsc_ioctl_t now int Using Linux code style to replace typedef rsc_ioctl_t with type int. Adhering to Linux code style. Reported by checkpatch.pl WARNING: do not add new typedefs Signed-off-by: Michael Rubin Link: https://lore.kernel.org/r/20250409055903.321438-19-matchstick@neverthere.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/common/gpib_os.c index 05c3ebf027a3c..41f4015babf76 100644 --- a/drivers/staging/gpib/common/gpib_os.c +++ b/drivers/staging/gpib/common/gpib_os.c @@ -1970,7 +1970,7 @@ static int event_ioctl(struct gpib_board *board, unsigned long arg) static int request_system_control_ioctl(struct gpib_board *board, unsigned long arg) { - rsc_ioctl_t request_control; + int request_control; int retval; retval = copy_from_user(&request_control, (void __user *)arg, sizeof(request_control)); diff --git a/drivers/staging/gpib/uapi/gpib_ioctl.h b/drivers/staging/gpib/uapi/gpib_ioctl.h index e9baa6724fb47..c3d82b6272100 100644 --- a/drivers/staging/gpib/uapi/gpib_ioctl.h +++ b/drivers/staging/gpib/uapi/gpib_ioctl.h @@ -107,7 +107,6 @@ struct gpib_select_device_path_ioctl { char device_path[0x1000]; }; -typedef int rsc_ioctl_t; typedef unsigned int t1_delay_ioctl_t; typedef short autospoll_ioctl_t; typedef short local_ppoll_mode_ioctl_t; @@ -152,7 +151,7 @@ enum gpib_ioctl { IBQUERY_BOARD_RSV = _IOR(GPIB_CODE, 31, int), IBSELECT_PCI = _IOWR(GPIB_CODE, 32, struct gpib_select_pci_ioctl), IBEVENT = _IOR(GPIB_CODE, 33, short), - IBRSC = _IOW(GPIB_CODE, 34, rsc_ioctl_t), + IBRSC = _IOW(GPIB_CODE, 34, int), IB_T1_DELAY = _IOW(GPIB_CODE, 35, t1_delay_ioctl_t), IBLOC = _IO(GPIB_CODE, 36),