aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/sata_mv.c2
-rw-r--r--drivers/ata/sata_sil.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index d689df52eae3..c73aa3bbaa3e 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -2052,7 +2052,7 @@ static void mv_port_init(struct ata_ioports *port, void __iomem *port_mmio)
2052 port->altstatus_addr = port->ctl_addr = shd_base + SHD_CTL_AST_OFS; 2052 port->altstatus_addr = port->ctl_addr = shd_base + SHD_CTL_AST_OFS;
2053 2053
2054 /* unused: */ 2054 /* unused: */
2055 port->cmd_addr = port->bmdma_addr = port->scr_addr = 0; 2055 port->cmd_addr = port->bmdma_addr = port->scr_addr = NULL;
2056 2056
2057 /* Clear any currently outstanding port interrupt conditions */ 2057 /* Clear any currently outstanding port interrupt conditions */
2058 serr_ofs = mv_scr_offset(SCR_ERROR); 2058 serr_ofs = mv_scr_offset(SCR_ERROR);
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index dca3d3749f06..14872556334b 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -339,7 +339,7 @@ static inline void __iomem *sil_scr_addr(struct ata_port *ap, unsigned int sc_re
339 break; 339 break;
340 } 340 }
341 341
342 return 0; 342 return NULL;
343} 343}
344 344
345static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg) 345static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg)