* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits) [media] af9015: Fix max I2C message size when used with tda18271 [media] IR: initialize ir_raw_event in few more drivers [media] Guard a divide in v4l1 compat layer [media] imon: fix nomouse modprobe option [media] imon: remove redundant change_protocol call [media] imon: fix my egregious brown paper bag w/rdev/idev split [media] cafe_ccic: Configure ov7670 correctly [media] ov7670: allow configuration of image size, clock speed, and I/O method [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016] [media] af9015: map DigitalNow TinyTwin v2 remote [media] DigitalNow TinyTwin remote controller [media] af9015: RC fixes and improvements videodev2.h.xml: Update to reflect the latest changes at videodev2.h [media] v4l: document new Bayer and monochrome pixel formats [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028 [media] firedtv: add parameter to fake ca_system_ids in CA_INFO [media] tm6000: fix a macro coding style issue tm6000: Remove some ugly debug code [media] Nova-S-Plus audio line input [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers ...
Showing the changes to drivers/staging/lirc/lirc_serial.c (1 of 531 files). Show all
Unified · Split
| @@ -372,7 +372,7 @@ static unsigned long conv_us_to_clocks; · 371 unmodified lines | ||
| 372 | 372 | static int init_timing_params(unsigned int new_duty_cycle, |
| 373 | 373 | unsigned int new_freq) |
| 374 | 374 | { |
| 375 | − unsigned long long loops_per_sec, work; | |
| 375 | + __u64 loops_per_sec, work; | |
| 376 | 376 | |
| 377 | 377 | duty_cycle = new_duty_cycle; |
| 378 | 378 | freq = new_freq; |
| @@ -987,8 +987,7 @@ static ssize_t lirc_write(struct file *file, const char *buf, · 608 unmodified lines | ||
| 987 | 987 | static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) |
| 988 | 988 | { |
| 989 | 989 | int result; |
| 990 | − unsigned long value; | |
| 991 | − unsigned int ivalue; | |
| 990 | + __u32 value; | |
| 992 | 991 | |
| 993 | 992 | switch (cmd) { |
| 994 | 993 | case LIRC_GET_SEND_MODE: |
| @@ -997,7 +996,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) · 2 unmodified lines | ||
| 997 | 996 | |
| 998 | 997 | result = put_user(LIRC_SEND2MODE |
| 999 | 998 | (hardware[type].features&LIRC_CAN_SEND_MASK), |
| 1000 | − (unsigned long *) arg); | |
| 999 | + (__u32 *) arg); | |
| 1001 | 1000 | if (result) |
| 1002 | 1001 | return result; |
| 1003 | 1002 | break; |
| @@ -1006,7 +1005,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) · 2 unmodified lines | ||
| 1006 | 1005 | if (!(hardware[type].features&LIRC_CAN_SEND_MASK)) |
| 1007 | 1006 | return -ENOIOCTLCMD; |
| 1008 | 1007 | |
| 1009 | − result = get_user(value, (unsigned long *) arg); | |
| 1008 | + result = get_user(value, (__u32 *) arg); | |
| 1010 | 1009 | if (result) |
| 1011 | 1010 | return result; |
| 1012 | 1011 | /* only LIRC_MODE_PULSE supported */ |
| @@ -1023,12 +1022,12 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) · 10 unmodified lines | ||
| 1023 | 1022 | if (!(hardware[type].features&LIRC_CAN_SET_SEND_DUTY_CYCLE)) |
| 1024 | 1023 | return -ENOIOCTLCMD; |
| 1025 | 1024 | |
| 1026 | − result = get_user(ivalue, (unsigned int *) arg); | |
| 1025 | + result = get_user(value, (__u32 *) arg); | |
| 1027 | 1026 | if (result) |
| 1028 | 1027 | return result; |
| 1029 | − if (ivalue <= 0 || ivalue > 100) | |
| 1028 | + if (value <= 0 || value > 100) | |
| 1030 | 1029 | return -EINVAL; |
| 1031 | − return init_timing_params(ivalue, freq); | |
| 1030 | + return init_timing_params(value, freq); | |
| 1032 | 1031 | break; |
| 1033 | 1032 | |
| 1034 | 1033 | case LIRC_SET_SEND_CARRIER: |
| @@ -1036,12 +1035,12 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) · 1 unmodified line | ||
| 1036 | 1035 | if (!(hardware[type].features&LIRC_CAN_SET_SEND_CARRIER)) |
| 1037 | 1036 | return -ENOIOCTLCMD; |
| 1038 | 1037 | |
| 1039 | − result = get_user(ivalue, (unsigned int *) arg); | |
| 1038 | + result = get_user(value, (__u32 *) arg); | |
| 1040 | 1039 | if (result) |
| 1041 | 1040 | return result; |
| 1042 | − if (ivalue > 500000 || ivalue < 20000) | |
| 1041 | + if (value > 500000 || value < 20000) | |
| 1043 | 1042 | return -EINVAL; |
| 1044 | − return init_timing_params(duty_cycle, ivalue); | |
| 1043 | + return init_timing_params(duty_cycle, value); | |
| 1045 | 1044 | break; |
| 1046 | 1045 | |
| 1047 | 1046 | default: |
| @@ -1054,6 +1053,9 @@ static const struct file_operations lirc_fops = { · 6 unmodified lines | ||
| 1054 | 1053 | .owner = THIS_MODULE, |
| 1055 | 1054 | .write = lirc_write, |
| 1056 | 1055 | .unlocked_ioctl = lirc_ioctl, |
| 1056 | +#ifdef CONFIG_COMPAT | |
| 1057 | + .compat_ioctl = lirc_ioctl, | |
| 1058 | +#endif | |
| 1057 | 1059 | .read = lirc_dev_fop_read, |
| 1058 | 1060 | .poll = lirc_dev_fop_poll, |
| 1059 | 1061 | .open = lirc_dev_fop_open, |