Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

ide-floppy: remove idefloppy_floppy_t typedef

Browse Source 
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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-10-17 18:09:16 +02:00
parent ea656980f4
commit 0df962777b
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/ide/ide-floppy.c
View File

@ -70,7 +70,7 @@
*/ */
static int ide_floppy_end_request(ide_drive_t *drive, int uptodate, int nsecs) static int ide_floppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
int error; int error;
@ -117,7 +117,7 @@ static void idefloppy_update_buffers(ide_drive_t *drive,
static void ide_floppy_callback(ide_drive_t *drive, int dsc) static void ide_floppy_callback(ide_drive_t *drive, int dsc)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct ide_atapi_pc *pc = drive->pc; struct ide_atapi_pc *pc = drive->pc;
int uptodate = pc->error ? 0 : 1; int uptodate = pc->error ? 0 : 1;
@ -154,7 +154,7 @@ static void ide_floppy_callback(ide_drive_t *drive, int dsc)
ide_floppy_end_request(drive, uptodate, 0); ide_floppy_end_request(drive, uptodate, 0);
} }
static void ide_floppy_report_error(idefloppy_floppy_t *floppy, static void ide_floppy_report_error(struct ide_disk_obj *floppy,
struct ide_atapi_pc *pc) struct ide_atapi_pc *pc)
{ {
/* supress error messages resulting from Medium not present */ /* supress error messages resulting from Medium not present */
@ -173,7 +173,7 @@ static void ide_floppy_report_error(idefloppy_floppy_t *floppy,
static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,
struct ide_atapi_pc *pc) struct ide_atapi_pc *pc)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
if (floppy->failed_pc == NULL && if (floppy->failed_pc == NULL &&
pc->c[0] != GPCMD_REQUEST_SENSE) pc->c[0] != GPCMD_REQUEST_SENSE)
@ -237,7 +237,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,
struct ide_atapi_pc *pc, struct request *rq, struct ide_atapi_pc *pc, struct request *rq,
unsigned long sector) unsigned long sector)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
int block = sector / floppy->bs_factor; int block = sector / floppy->bs_factor;
int blocks = rq->nr_sectors / floppy->bs_factor; int blocks = rq->nr_sectors / floppy->bs_factor;
int cmd = rq_data_dir(rq); int cmd = rq_data_dir(rq);
@ -261,7 +261,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,
pc->flags |= PC_FLAG_DMA_OK; pc->flags |= PC_FLAG_DMA_OK;
} }
static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,
struct ide_atapi_pc *pc, struct request *rq) struct ide_atapi_pc *pc, struct request *rq)
{ {
ide_init_pc(pc); ide_init_pc(pc);
@ -283,7 +283,7 @@ static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy,
static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
struct request *rq, sector_t block) struct request *rq, sector_t block)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct ide_atapi_pc *pc; struct ide_atapi_pc *pc;
@ -344,7 +344,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
*/ */
static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive) static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct gendisk *disk = floppy->disk; struct gendisk *disk = floppy->disk;
struct ide_atapi_pc pc; struct ide_atapi_pc pc;
u8 *page; u8 *page;
@ -407,7 +407,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
*/ */
static int ide_floppy_get_capacity(ide_drive_t *drive) static int ide_floppy_get_capacity(ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct gendisk *disk = floppy->disk; struct gendisk *disk = floppy->disk;
struct ide_atapi_pc pc; struct ide_atapi_pc pc;
u8 *cap_desc; u8 *cap_desc;

2
drivers/ide/ide-floppy.h
View File

@ -4,8 +4,6 @@
#include "ide-gd.h" #include "ide-gd.h"
#ifdef CONFIG_IDE_GD_ATAPI #ifdef CONFIG_IDE_GD_ATAPI
typedef struct ide_disk_obj idefloppy_floppy_t;
/* /*
* Pages of the SELECT SENSE / MODE SENSE packet commands. * Pages of the SELECT SENSE / MODE SENSE packet commands.
* See SFF-8070i spec. * See SFF-8070i spec.

8
drivers/ide/ide-floppy_ioctl.c
View File

@ -113,7 +113,7 @@ static void ide_floppy_create_format_unit_cmd(struct ide_atapi_pc *pc, int b,
static int ide_floppy_get_sfrp_bit(ide_drive_t *drive) static int ide_floppy_get_sfrp_bit(ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct ide_atapi_pc pc; struct ide_atapi_pc pc;
drive->atapi_flags &= ~IDE_AFLAG_SRFP; drive->atapi_flags &= ~IDE_AFLAG_SRFP;
@ -132,7 +132,7 @@ static int ide_floppy_get_sfrp_bit(ide_drive_t *drive)
static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg) static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct ide_atapi_pc pc; struct ide_atapi_pc pc;
int blocks, length, flags, err = 0; int blocks, length, flags, err = 0;
@ -190,7 +190,7 @@ out:
static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg) static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct ide_atapi_pc pc; struct ide_atapi_pc pc;
int progress_indication = 0x10000; int progress_indication = 0x10000;
@ -226,7 +226,7 @@ static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg)
static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc, static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
unsigned long arg, unsigned int cmd) unsigned long arg, unsigned int cmd)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; struct ide_disk_obj *floppy = drive->driver_data;
struct gendisk *disk = floppy->disk; struct gendisk *disk = floppy->disk;
int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0; int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0;