projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NFS: Cleanup the coalescing code
[powerpc.git]
/
drivers
/
ata
/
pata_sil680.c
diff --git
a/drivers/ata/pata_sil680.c
b/drivers/ata/pata_sil680.c
index
dab2889
..
6770820
100644
(file)
--- a/
drivers/ata/pata_sil680.c
+++ b/
drivers/ata/pata_sil680.c
@@
-33,7
+33,7
@@
#include <linux/libata.h>
#define DRV_NAME "pata_sil680"
#include <linux/libata.h>
#define DRV_NAME "pata_sil680"
-#define DRV_VERSION "0.4.
5
"
+#define DRV_VERSION "0.4.
6
"
/**
* sil680_selreg - return register base
/**
* sil680_selreg - return register base
@@
-91,12
+91,6
@@
static int sil680_cable_detect(struct ata_port *ap) {
return ATA_CBL_PATA40;
}
return ATA_CBL_PATA40;
}
-static int sil680_pre_reset(struct ata_port *ap)
-{
- ap->cbl = sil680_cable_detect(ap);
- return ata_std_prereset(ap);
-}
-
/**
* sil680_bus_reset - reset the SIL680 bus
* @ap: ATA port to reset
/**
* sil680_bus_reset - reset the SIL680 bus
* @ap: ATA port to reset
@@
-119,7
+113,7
@@
static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes)
static void sil680_error_handler(struct ata_port *ap)
{
static void sil680_error_handler(struct ata_port *ap)
{
- ata_bmdma_drive_eh(ap,
sil680_pre_
reset, sil680_bus_reset, NULL, ata_std_postreset);
+ ata_bmdma_drive_eh(ap,
ata_std_pre
reset, sil680_bus_reset, NULL, ata_std_postreset);
}
/**
}
/**
@@
-257,6
+251,7
@@
static struct ata_port_operations sil680_port_ops = {
.thaw = ata_bmdma_thaw,
.error_handler = sil680_error_handler,
.post_internal_cmd = ata_bmdma_post_internal_cmd,
.thaw = ata_bmdma_thaw,
.error_handler = sil680_error_handler,
.post_internal_cmd = ata_bmdma_post_internal_cmd,
+ .cable_detect = sil680_cable_detect,
.bmdma_setup = ata_bmdma_setup,
.bmdma_start = ata_bmdma_start,
.bmdma_setup = ata_bmdma_setup,
.bmdma_start = ata_bmdma_start,