diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/coda.h | 2 | ||||
| -rw-r--r-- | include/linux/fs.h | 13 | ||||
| -rw-r--r-- | include/linux/i8k.h | 12 | ||||
| -rw-r--r-- | include/linux/if_pppox.h | 4 | ||||
| -rw-r--r-- | include/linux/input.h | 2 | ||||
| -rw-r--r-- | include/linux/matroxfb.h | 12 | ||||
| -rw-r--r-- | include/linux/pmu.h | 10 | ||||
| -rw-r--r-- | include/linux/radeonfb.h | 4 |
8 files changed, 31 insertions, 28 deletions
diff --git a/include/linux/coda.h b/include/linux/coda.h index 0d168b715ed7..0ea09388b191 100644 --- a/include/linux/coda.h +++ b/include/linux/coda.h @@ -324,7 +324,7 @@ struct coda_statfs { #define VC_MAXMSGSIZE sizeof(union inputArgs)+sizeof(union outputArgs) +\ VC_MAXDATASIZE -#define CIOC_KERNEL_VERSION _IOWR('c', 10, sizeof (int)) +#define CIOC_KERNEL_VERSION _IOWR('c', 10, size_t) #if 0 #define CODA_KERNEL_VERSION 0 /* don't care about kernel version number */ diff --git a/include/linux/fs.h b/include/linux/fs.h index d10db09f6164..20a7b18b0841 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -188,15 +188,18 @@ extern int leases_enable, dir_notify_enable, lease_break_time; #define BLKSSZGET _IO(0x12,104)/* get block device sector size */ #if 0 #define BLKPG _IO(0x12,105)/* See blkpg.h */ -#define BLKELVGET _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))/* elevator get */ -#define BLKELVSET _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))/* elevator set */ + +/* Some people are morons. Do not use sizeof! */ + +#define BLKELVGET _IOR(0x12,106,size_t)/* elevator get */ +#define BLKELVSET _IOW(0x12,107,size_t)/* elevator set */ /* This was here just to show that the number is taken - probably all these _IO(0x12,*) ioctls should be moved to blkpg.h. */ #endif /* A jump here: 108-111 have been used for various private purposes. */ -#define BLKBSZGET _IOR(0x12,112,sizeof(int)) -#define BLKBSZSET _IOW(0x12,113,sizeof(int)) -#define BLKGETSIZE64 _IOR(0x12,114,sizeof(u64)) /* return device size in bytes (u64 *arg) */ +#define BLKBSZGET _IOR(0x12,112,size_t) +#define BLKBSZSET _IOW(0x12,113,size_t) +#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size in bytes (u64 *arg) */ #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1) /* bmap access */ diff --git a/include/linux/i8k.h b/include/linux/i8k.h index a6d3b694a0cd..8ae0873f6eaa 100644 --- a/include/linux/i8k.h +++ b/include/linux/i8k.h @@ -22,12 +22,12 @@ #define I8K_BIOS_VERSION _IOR ('i', 0x80, 4) #define I8K_MACHINE_ID _IOR ('i', 0x81, 16) -#define I8K_POWER_STATUS _IOR ('i', 0x82, sizeof(int)) -#define I8K_FN_STATUS _IOR ('i', 0x83, sizeof(int)) -#define I8K_GET_TEMP _IOR ('i', 0x84, sizeof(int)) -#define I8K_GET_SPEED _IOWR('i', 0x85, sizeof(int)) -#define I8K_GET_FAN _IOWR('i', 0x86, sizeof(int)) -#define I8K_SET_FAN _IOWR('i', 0x87, sizeof(int)*2) +#define I8K_POWER_STATUS _IOR ('i', 0x82, size_t) +#define I8K_FN_STATUS _IOR ('i', 0x83, size_t) +#define I8K_GET_TEMP _IOR ('i', 0x84, size_t) +#define I8K_GET_SPEED _IOWR('i', 0x85, size_t) +#define I8K_GET_FAN _IOWR('i', 0x86, size_t) +#define I8K_SET_FAN _IOWR('i', 0x87, size_t) #define I8K_FAN_LEFT 1 #define I8K_FAN_RIGHT 0 diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 581531924426..3348fc7f611e 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -67,9 +67,9 @@ struct sockaddr_pppox { * ********************************************************************/ -#define PPPOEIOCSFWD _IOW(0xB1 ,0, sizeof(struct sockaddr_pppox)) +#define PPPOEIOCSFWD _IOW(0xB1 ,0, size_t) #define PPPOEIOCDFWD _IO(0xB1 ,1) -/*#define PPPOEIOCGFWD _IOWR(0xB1,2, sizeof(struct sockaddr_pppox))*/ +/*#define PPPOEIOCGFWD _IOWR(0xB1,2, size_t)*/ /* Codes to identify message types */ #define PADI_CODE 0x09 diff --git a/include/linux/input.h b/include/linux/input.h index da49f7ee0f18..770644b05c59 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -73,7 +73,7 @@ struct input_absinfo { #define EVIOCGABS(abs) _IOR('E', 0x40 + abs, struct input_absinfo) /* get abs value/limits */ #define EVIOCSABS(abs) _IOW('E', 0xc0 + abs, struct input_absinfo) /* set abs value/limits */ -#define EVIOCSFF _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect)) /* send a force effect to a force feedback device */ +#define EVIOCSFF _IOC(_IOC_WRITE, 'E', 0x80, size_t) /* send a force effect to a force feedback device */ #define EVIOCRMFF _IOW('E', 0x81, int) /* Erase a force effect */ #define EVIOCGEFFECTS _IOR('E', 0x84, int) /* Report number of effects playable at the same time */ diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h index 83fea12ad181..ae5b09493062 100644 --- a/include/linux/matroxfb.h +++ b/include/linux/matroxfb.h @@ -15,21 +15,21 @@ struct matroxioc_output_mode { #define MATROXFB_OUTPUT_MODE_NTSC 0x0002 #define MATROXFB_OUTPUT_MODE_MONITOR 0x0080 }; -#define MATROXFB_SET_OUTPUT_MODE _IOW('n',0xFA,sizeof(struct matroxioc_output_mode)) -#define MATROXFB_GET_OUTPUT_MODE _IOWR('n',0xFA,sizeof(struct matroxioc_output_mode)) +#define MATROXFB_SET_OUTPUT_MODE _IOW('n',0xFA,size_t) +#define MATROXFB_GET_OUTPUT_MODE _IOWR('n',0xFA,size_t) /* bitfield */ #define MATROXFB_OUTPUT_CONN_PRIMARY (1 << MATROXFB_OUTPUT_PRIMARY) #define MATROXFB_OUTPUT_CONN_SECONDARY (1 << MATROXFB_OUTPUT_SECONDARY) #define MATROXFB_OUTPUT_CONN_DFP (1 << MATROXFB_OUTPUT_DFP) /* connect these outputs to this framebuffer */ -#define MATROXFB_SET_OUTPUT_CONNECTION _IOW('n',0xF8,sizeof(__u32)) +#define MATROXFB_SET_OUTPUT_CONNECTION _IOW('n',0xF8,size_t) /* which outputs are connected to this framebuffer */ -#define MATROXFB_GET_OUTPUT_CONNECTION _IOR('n',0xF8,sizeof(__u32)) +#define MATROXFB_GET_OUTPUT_CONNECTION _IOR('n',0xF8,size_t) /* which outputs are available for this framebuffer */ -#define MATROXFB_GET_AVAILABLE_OUTPUTS _IOR('n',0xF9,sizeof(__u32)) +#define MATROXFB_GET_AVAILABLE_OUTPUTS _IOR('n',0xF9,size_t) /* which outputs exist on this framebuffer */ -#define MATROXFB_GET_ALL_OUTPUTS _IOR('n',0xFB,sizeof(__u32)) +#define MATROXFB_GET_ALL_OUTPUTS _IOR('n',0xFB,size_t) enum matroxfb_ctrl_id { MATROXFB_CID_TESTOUT = V4L2_CID_PRIVATE_BASE, diff --git a/include/linux/pmu.h b/include/linux/pmu.h index bc331f946fec..818a84c1edff 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h @@ -122,15 +122,15 @@ enum { /* no param */ #define PMU_IOC_SLEEP _IO('B', 0) /* out param: u32* backlight value: 0 to 15 */ -#define PMU_IOC_GET_BACKLIGHT _IOR('B', 1, sizeof(__u32*)) +#define PMU_IOC_GET_BACKLIGHT _IOR('B', 1, size_t) /* in param: u32 backlight value: 0 to 15 */ -#define PMU_IOC_SET_BACKLIGHT _IOW('B', 2, sizeof(__u32)) +#define PMU_IOC_SET_BACKLIGHT _IOW('B', 2, size_t) /* out param: u32* PMU model */ -#define PMU_IOC_GET_MODEL _IOR('B', 3, sizeof(__u32*)) +#define PMU_IOC_GET_MODEL _IOR('B', 3, size_t) /* out param: u32* has_adb: 0 or 1 */ -#define PMU_IOC_HAS_ADB _IOR('B', 4, sizeof(__u32*)) +#define PMU_IOC_HAS_ADB _IOR('B', 4, size_t) /* out param: u32* can_sleep: 0 or 1 */ -#define PMU_IOC_CAN_SLEEP _IOR('B', 5, sizeof(__u32*)) +#define PMU_IOC_CAN_SLEEP _IOR('B', 5, size_t) /* no param */ #define PMU_IOC_GRAB_BACKLIGHT _IOR('B', 6, 0) diff --git a/include/linux/radeonfb.h b/include/linux/radeonfb.h index 99bdf91bbc5d..5bd8975ed78e 100644 --- a/include/linux/radeonfb.h +++ b/include/linux/radeonfb.h @@ -8,8 +8,8 @@ #define ATY_RADEON_CRT_ON 0x00000002 -#define FBIO_RADEON_GET_MIRROR _IOR('@', 3, sizeof(__u32*)) -#define FBIO_RADEON_SET_MIRROR _IOW('@', 4, sizeof(__u32*)) +#define FBIO_RADEON_GET_MIRROR _IOR('@', 3, size_t) +#define FBIO_RADEON_SET_MIRROR _IOW('@', 4, size_t) #endif |