Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d98f88c222bf56cfa5839930fb0d0af22d1c36bf
Commit:     d98f88c222bf56cfa5839930fb0d0af22d1c36bf
Parent:     1ec414ecc0fe09a610dfafcc6958103a37b7eb0f
Author:     Harvey Harrison <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 13 21:14:20 2008 -0800
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Fri Feb 15 13:51:24 2008 -0500

    ata: sparse fixes for pata_amd.c
    
    drop return statement.
    drivers/ata/pata_amd.c:149:2: warning: returning void-valued expression
    
    Commit ce54d1616302117fa98513ae916bb3333e1c02ea pata_amd: update mode 
selection for NV PATAs
    
    added the initializer for nv_mode_filter but missed deleting the previously
    set mode_filter
    
    drivers/ata/pata_amd.c:509:3: warning: Initializer entry defined twice
    drivers/ata/pata_amd.c:521:3:   also defined here
    drivers/ata/pata_amd.c:544:3: warning: Initializer entry defined twice
    drivers/ata/pata_amd.c:556:3:   also defined here
    
    Signed-off-by: Harvey Harrison <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/ata/pata_amd.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index ea567e2..4b8d9b5 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -146,9 +146,8 @@ static int amd_pre_reset(struct ata_link *link, unsigned 
long deadline)
 
 static void amd_error_handler(struct ata_port *ap)
 {
-       return ata_bmdma_drive_eh(ap, amd_pre_reset,
-                                     ata_std_softreset, NULL,
-                                     ata_std_postreset);
+       ata_bmdma_drive_eh(ap, amd_pre_reset, ata_std_softreset, NULL,
+                          ata_std_postreset);
 }
 
 static int amd_cable_detect(struct ata_port *ap)
@@ -506,7 +505,6 @@ static struct ata_port_operations amd133_port_ops = {
 static struct ata_port_operations nv100_port_ops = {
        .set_piomode    = nv100_set_piomode,
        .set_dmamode    = nv100_set_dmamode,
-       .mode_filter    = ata_pci_default_filter,
        .tf_load        = ata_tf_load,
        .tf_read        = ata_tf_read,
        .check_status   = ata_check_status,
@@ -541,7 +539,6 @@ static struct ata_port_operations nv100_port_ops = {
 static struct ata_port_operations nv133_port_ops = {
        .set_piomode    = nv133_set_piomode,
        .set_dmamode    = nv133_set_dmamode,
-       .mode_filter    = ata_pci_default_filter,
        .tf_load        = ata_tf_load,
        .tf_read        = ata_tf_read,
        .check_status   = ata_check_status,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to