[PATCH] kill default_flushcache() and ide_drive_t->flushcache

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 064352897617b2004170ed92742648fa52317969..9a82c49587cf33067784127cd20504ba6699bdea 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1700,7 +1700,6 @@ static ide_driver_t idedisk_driver = {
        .busy                   = 0,
        .supports_dsc_overlap   = 0,
        .cleanup                = idedisk_cleanup,
-       .flushcache             = do_idedisk_flushcache,
        .do_request             = ide_do_rw_disk,
        .sense                  = idedisk_dump_status,
        .error                  = idedisk_error,

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index e8cb1886e72979000c0dc8766710fde1d66a465d..68a6a3303aa4a250c6eb5f643e122df62b57a878 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -2168,20 +2168,6 @@ static int default_cleanup (ide_drive_t *drive)
        return ide_unregister_subdriver(drive);
 }
 
-/*
- *     Default function to use for the cache flush operation. This
- *     must be replaced for disk devices (see ATA specification
- *     documents on cache flush and drive suspend rules)
- *
- *     If we have no device attached or the device is not writable
- *     this handler is sufficient.
- */
- 
-static int default_flushcache (ide_drive_t *drive)
-{
-       return 0;
-}
-
 static ide_startstop_t default_do_request (ide_drive_t *drive, struct request *rq, sector_t block)
 {
        ide_end_request(drive, 0, 0);
@@ -2244,7 +2230,6 @@ static ide_startstop_t default_start_power_step(ide_drive_t *drive,
 static void setup_driver_defaults (ide_driver_t *d)
 {
        if (d->cleanup == NULL)         d->cleanup = default_cleanup;
-       if (d->flushcache == NULL)      d->flushcache = default_flushcache;
        if (d->do_request == NULL)      d->do_request = default_do_request;
        if (d->end_request == NULL)     d->end_request = default_end_request;
        if (d->sense == NULL)           d->sense = default_sense;

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 8ad1539d05b5388768d50a5f11eb063ec4617fbb..cdb7bc7cce926d26bbe92ece6e3f8c08198922f8 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1160,7 +1160,6 @@ typedef struct ide_driver_s {
        unsigned busy                   : 1;
        unsigned supports_dsc_overlap   : 1;
        int             (*cleanup)(ide_drive_t *);
-       int             (*flushcache)(ide_drive_t *);
        ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t);
        int             (*end_request)(ide_drive_t *, int, int);
        u8              (*sense)(ide_drive_t *, const char *, u8);