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

Download as
Browse Code ยป

Commit 0df962777b550a4b67191b3ee2555be139da4e7d

Authored by Bartlomiej Zolnierkiewicz
1 parent ea656980f4
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 idefloppy_floppy_t typedef 

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 3 changed files with 13 additions and 15 deletions Side-by-side Diff

drivers/ide/ide-floppy.c
Diff comments   View file @ 0df9627
... ... @@ -70,7 +70,7 @@
70 70 */
71 71 static int ide_floppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)
72 72 {
73   - idefloppy_floppy_t *floppy = drive->driver_data;
  73 + struct ide_disk_obj *floppy = drive->driver_data;
74 74 struct request *rq = HWGROUP(drive)->rq;
75 75 int error;
76 76  
... ... @@ -117,7 +117,7 @@
117 117  
118 118 static void ide_floppy_callback(ide_drive_t *drive, int dsc)
119 119 {
120   - idefloppy_floppy_t *floppy = drive->driver_data;
  120 + struct ide_disk_obj *floppy = drive->driver_data;
121 121 struct ide_atapi_pc *pc = drive->pc;
122 122 int uptodate = pc->error ? 0 : 1;
123 123  
... ... @@ -154,7 +154,7 @@
154 154 ide_floppy_end_request(drive, uptodate, 0);
155 155 }
156 156  
157   -static void ide_floppy_report_error(idefloppy_floppy_t *floppy,
  157 +static void ide_floppy_report_error(struct ide_disk_obj *floppy,
158 158 struct ide_atapi_pc *pc)
159 159 {
160 160 /* supress error messages resulting from Medium not present */
... ... @@ -173,7 +173,7 @@
173 173 static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,
174 174 struct ide_atapi_pc *pc)
175 175 {
176   - idefloppy_floppy_t *floppy = drive->driver_data;
  176 + struct ide_disk_obj *floppy = drive->driver_data;
177 177  
178 178 if (floppy->failed_pc == NULL &&
179 179 pc->c[0] != GPCMD_REQUEST_SENSE)
... ... @@ -237,7 +237,7 @@
237 237 struct ide_atapi_pc *pc, struct request *rq,
238 238 unsigned long sector)
239 239 {
240   - idefloppy_floppy_t *floppy = drive->driver_data;
  240 + struct ide_disk_obj *floppy = drive->driver_data;
241 241 int block = sector / floppy->bs_factor;
242 242 int blocks = rq->nr_sectors / floppy->bs_factor;
243 243 int cmd = rq_data_dir(rq);
... ... @@ -261,7 +261,7 @@
261 261 pc->flags |= PC_FLAG_DMA_OK;
262 262 }
263 263  
264   -static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy,
  264 +static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,
265 265 struct ide_atapi_pc *pc, struct request *rq)
266 266 {
267 267 ide_init_pc(pc);
... ... @@ -283,7 +283,7 @@
283 283 static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
284 284 struct request *rq, sector_t block)
285 285 {
286   - idefloppy_floppy_t *floppy = drive->driver_data;
  286 + struct ide_disk_obj *floppy = drive->driver_data;
287 287 ide_hwif_t *hwif = drive->hwif;
288 288 struct ide_atapi_pc *pc;
289 289  
... ... @@ -344,7 +344,7 @@
344 344 */
345 345 static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
346 346 {
347   - idefloppy_floppy_t *floppy = drive->driver_data;
  347 + struct ide_disk_obj *floppy = drive->driver_data;
348 348 struct gendisk *disk = floppy->disk;
349 349 struct ide_atapi_pc pc;
350 350 u8 *page;
... ... @@ -407,7 +407,7 @@
407 407 */
408 408 static int ide_floppy_get_capacity(ide_drive_t *drive)
409 409 {
410   - idefloppy_floppy_t *floppy = drive->driver_data;
  410 + struct ide_disk_obj *floppy = drive->driver_data;
411 411 struct gendisk *disk = floppy->disk;
412 412 struct ide_atapi_pc pc;
413 413 u8 *cap_desc;
drivers/ide/ide-floppy.h
Diff comments   View file @ 0df9627
... ... @@ -4,8 +4,6 @@
4 4 #include "ide-gd.h"
5 5  
6 6 #ifdef CONFIG_IDE_GD_ATAPI
7   -typedef struct ide_disk_obj idefloppy_floppy_t;
8   -
9 7 /*
10 8 * Pages of the SELECT SENSE / MODE SENSE packet commands.
11 9 * See SFF-8070i spec.
drivers/ide/ide-floppy_ioctl.c
Diff comments   View file @ 0df9627
... ... @@ -113,7 +113,7 @@
113 113  
114 114 static int ide_floppy_get_sfrp_bit(ide_drive_t *drive)
115 115 {
116   - idefloppy_floppy_t *floppy = drive->driver_data;
  116 + struct ide_disk_obj *floppy = drive->driver_data;
117 117 struct ide_atapi_pc pc;
118 118  
119 119 drive->atapi_flags &= ~IDE_AFLAG_SRFP;
... ... @@ -132,7 +132,7 @@
132 132  
133 133 static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
134 134 {
135   - idefloppy_floppy_t *floppy = drive->driver_data;
  135 + struct ide_disk_obj *floppy = drive->driver_data;
136 136 struct ide_atapi_pc pc;
137 137 int blocks, length, flags, err = 0;
138 138  
... ... @@ -190,7 +190,7 @@
190 190  
191 191 static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg)
192 192 {
193   - idefloppy_floppy_t *floppy = drive->driver_data;
  193 + struct ide_disk_obj *floppy = drive->driver_data;
194 194 struct ide_atapi_pc pc;
195 195 int progress_indication = 0x10000;
196 196  
... ... @@ -226,7 +226,7 @@
226 226 static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
227 227 unsigned long arg, unsigned int cmd)
228 228 {
229   - idefloppy_floppy_t *floppy = drive->driver_data;
  229 + struct ide_disk_obj *floppy = drive->driver_data;
230 230 struct gendisk *disk = floppy->disk;
231 231 int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0;
232 232