Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit ae7e8ddc34d8cd302886a1f8d1db8a3400532d1f

Authored by Borislav Petkov
Committed by Bartlomiej Zolnierkiewicz
1 parent 32925e1a16
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

ide-floppy: remove unused IDEFLOPPY_USE_READ12 

This flag is not being set anywhere in the driver so it can go.

Bart:
- minor CodingStyle fixup

Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 1 changed file with 7 additions and 11 deletions Side-by-side Diff

drivers/ide/ide-floppy.c
Diff comments   View file @ ae7e8dd
... ... @@ -180,7 +180,6 @@
180 180 */
181 181 #define IDEFLOPPY_DRQ_INTERRUPT 0 /* DRQ interrupt device */
182 182 #define IDEFLOPPY_MEDIA_CHANGED 1 /* Media may have changed */
183   -#define IDEFLOPPY_USE_READ12 2 /* Use READ12/WRITE12 or READ10/WRITE10 */
184 183 #define IDEFLOPPY_FORMAT_IN_PROGRESS 3 /* Format in progress */
185 184 #define IDEFLOPPY_CLIK_DRIVE 4 /* Avoid commands not supported in Clik drive */
186 185 #define IDEFLOPPY_ZIP_DRIVE 5 /* Requires BH algorithm for packets */
187 186  
188 187  
189 188  
... ... @@ -888,25 +887,22 @@
888 887 pc->c[0] = GPCMD_TEST_UNIT_READY;
889 888 }
890 889  
891   -static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct request *rq, unsigned long sector)
  890 +static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
  891 + idefloppy_pc_t *pc, struct request *rq,
  892 + unsigned long sector)
892 893 {
893 894 int block = sector / floppy->bs_factor;
894 895 int blocks = rq->nr_sectors / floppy->bs_factor;
895 896 int cmd = rq_data_dir(rq);
896 897  
897   - debug_log("create_rw1%d_cmd: block == %d, blocks == %d\n",
898   - 2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags),
  898 + debug_log("create_rw10_cmd: block == %d, blocks == %d\n",
899 899 block, blocks);
900 900  
901 901 idefloppy_init_pc(pc);
902   - if (test_bit(IDEFLOPPY_USE_READ12, &floppy->flags)) {
903   - pc->c[0] = cmd == READ ? GPCMD_READ_12 : GPCMD_WRITE_12;
904   - put_unaligned(cpu_to_be32(blocks), (unsigned int *) &pc->c[6]);
905   - } else {
906   - pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
907   - put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
908   - }
  902 + pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
  903 + put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
909 904 put_unaligned(cpu_to_be32(block), (unsigned int *) &pc->c[2]);
  905 +
910 906 pc->callback = &idefloppy_rw_callback;
911 907 pc->rq = rq;
912 908 pc->b_count = cmd == READ ? 0 : rq->bio->bi_size;