Commit d98f88c2 authored by Harvey Harrison's avatar Harvey Harrison Committed by Jeff Garzik

ata: sparse fixes for pata_amd.c

drop return statement.
drivers/ata/pata_amd.c:149:2: warning: returning void-valued expression

Commit ce54d161 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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1ec414ec
...@@ -146,8 +146,7 @@ static int amd_pre_reset(struct ata_link *link, unsigned long deadline) ...@@ -146,8 +146,7 @@ static int amd_pre_reset(struct ata_link *link, unsigned long deadline)
static void amd_error_handler(struct ata_port *ap) static void amd_error_handler(struct ata_port *ap)
{ {
return ata_bmdma_drive_eh(ap, amd_pre_reset, ata_bmdma_drive_eh(ap, amd_pre_reset, ata_std_softreset, NULL,
ata_std_softreset, NULL,
ata_std_postreset); ata_std_postreset);
} }
...@@ -506,7 +505,6 @@ static struct ata_port_operations amd133_port_ops = { ...@@ -506,7 +505,6 @@ static struct ata_port_operations amd133_port_ops = {
static struct ata_port_operations nv100_port_ops = { static struct ata_port_operations nv100_port_ops = {
.set_piomode = nv100_set_piomode, .set_piomode = nv100_set_piomode,
.set_dmamode = nv100_set_dmamode, .set_dmamode = nv100_set_dmamode,
.mode_filter = ata_pci_default_filter,
.tf_load = ata_tf_load, .tf_load = ata_tf_load,
.tf_read = ata_tf_read, .tf_read = ata_tf_read,
.check_status = ata_check_status, .check_status = ata_check_status,
...@@ -541,7 +539,6 @@ static struct ata_port_operations nv100_port_ops = { ...@@ -541,7 +539,6 @@ static struct ata_port_operations nv100_port_ops = {
static struct ata_port_operations nv133_port_ops = { static struct ata_port_operations nv133_port_ops = {
.set_piomode = nv133_set_piomode, .set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode, .set_dmamode = nv133_set_dmamode,
.mode_filter = ata_pci_default_filter,
.tf_load = ata_tf_load, .tf_load = ata_tf_load,
.tf_read = ata_tf_read, .tf_read = ata_tf_read,
.check_status = ata_check_status, .check_status = ata_check_status,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment