Commit e3faa2481e832568d13dfa3a52d17525b322cb8f
1 parent
51509eec34
Exists in
master
and in
4 other branches
ide-floppy: remove needless parens
Cc: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Showing 1 changed file with 16 additions and 11 deletions Side-by-side Diff
drivers/ide/ide-floppy.c
... | ... | @@ -738,7 +738,7 @@ |
738 | 738 | return 1; |
739 | 739 | |
740 | 740 | floppy->srfp = pc.buf[8 + 2] & 0x40; |
741 | - return (0); | |
741 | + return 0; | |
742 | 742 | } |
743 | 743 | |
744 | 744 | /* |
745 | 745 | |
746 | 746 | |
747 | 747 | |
... | ... | @@ -866,16 +866,17 @@ |
866 | 866 | int __user *argp; |
867 | 867 | |
868 | 868 | if (get_user(u_array_size, arg)) |
869 | - return (-EFAULT); | |
869 | + return -EFAULT; | |
870 | 870 | |
871 | 871 | if (u_array_size <= 0) |
872 | - return (-EINVAL); | |
872 | + return -EINVAL; | |
873 | 873 | |
874 | 874 | idefloppy_create_read_capacity_cmd(&pc); |
875 | 875 | if (idefloppy_queue_pc_tail(drive, &pc)) { |
876 | 876 | printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n"); |
877 | - return (-EIO); | |
877 | + return -EIO; | |
878 | 878 | } |
879 | + | |
879 | 880 | header_len = pc.buf[3]; |
880 | 881 | desc_cnt = header_len / 8; /* capacity descriptor of 8 bytes */ |
881 | 882 | |
882 | 883 | |
883 | 884 | |
... | ... | @@ -897,19 +898,22 @@ |
897 | 898 | length = be16_to_cpup((__be16 *)&pc.buf[desc_start + 6]); |
898 | 899 | |
899 | 900 | if (put_user(blocks, argp)) |
900 | - return(-EFAULT); | |
901 | + return -EFAULT; | |
902 | + | |
901 | 903 | ++argp; |
902 | 904 | |
903 | 905 | if (put_user(length, argp)) |
904 | - return (-EFAULT); | |
906 | + return -EFAULT; | |
907 | + | |
905 | 908 | ++argp; |
906 | 909 | |
907 | 910 | ++u_index; |
908 | 911 | } |
909 | 912 | |
910 | 913 | if (put_user(u_index, arg)) |
911 | - return (-EFAULT); | |
912 | - return (0); | |
914 | + return -EFAULT; | |
915 | + | |
916 | + return 0; | |
913 | 917 | } |
914 | 918 | |
915 | 919 | /* |
... | ... | @@ -931,7 +935,7 @@ |
931 | 935 | if (floppy->srfp) { |
932 | 936 | idefloppy_create_request_sense_cmd(&pc); |
933 | 937 | if (idefloppy_queue_pc_tail(drive, &pc)) |
934 | - return (-EIO); | |
938 | + return -EIO; | |
935 | 939 | |
936 | 940 | if (floppy->sense_key == 2 && |
937 | 941 | floppy->asc == 4 && |
938 | 942 | |
939 | 943 | |
... | ... | @@ -950,10 +954,11 @@ |
950 | 954 | |
951 | 955 | progress_indication = ((stat & ATA_DSC) == 0) ? 0 : 0x10000; |
952 | 956 | } |
957 | + | |
953 | 958 | if (put_user(progress_indication, arg)) |
954 | - return (-EFAULT); | |
959 | + return -EFAULT; | |
955 | 960 | |
956 | - return (0); | |
961 | + return 0; | |
957 | 962 | } |
958 | 963 | |
959 | 964 | static sector_t idefloppy_capacity(ide_drive_t *drive) |