From: Michal Simek Date: Thu, 2 Nov 2017 14:53:56 +0000 (+0100) Subject: ata: Fix ahci wording X-Git-Tag: v2018.01-rc1~59^2~74 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e81589ea4475387670e57f5ce23465dd761edccc;p=oweals%2Fu-boot.git ata: Fix ahci wording s/achi_/ahci_/g Signed-off-by: Michal Simek Reviewed-by: Simon Glass --- diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 5e4df19386..690d35c890 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1026,7 +1026,7 @@ void scsi_low_level_init(int busdevfunc) #ifndef CONFIG_SCSI_AHCI_PLAT # if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SCSI) -int achi_init_one_dm(struct udevice *dev) +int ahci_init_one_dm(struct udevice *dev) { struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev); @@ -1035,7 +1035,7 @@ int achi_init_one_dm(struct udevice *dev) #endif #endif -int achi_start_ports_dm(struct udevice *dev) +int ahci_start_ports_dm(struct udevice *dev) { struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev); diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c index b16304baed..029b7784f6 100644 --- a/drivers/ata/dwc_ahci.c +++ b/drivers/ata/dwc_ahci.c @@ -85,7 +85,7 @@ static int dwc_ahci_probe(struct udevice *dev) if (ret) return ret; - return achi_start_ports_dm(dev); + return ahci_start_ports_dm(dev); } static const struct udevice_id dwc_ahci_ids[] = { diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c index 3ef7b49215..bae26898ba 100644 --- a/drivers/ata/sata_ceva.c +++ b/drivers/ata/sata_ceva.c @@ -118,11 +118,11 @@ static int sata_ceva_probe(struct udevice *dev) ceva_init_sata(plat->base); - ret = achi_init_one_dm(dev); + ret = ahci_init_one_dm(dev); if (ret) return ret; - return achi_start_ports_dm(dev); + return ahci_start_ports_dm(dev); } static const struct udevice_id sata_ceva_ids[] = { diff --git a/include/ahci.h b/include/ahci.h index 33171b7ffd..cc36d81f98 100644 --- a/include/ahci.h +++ b/include/ahci.h @@ -234,18 +234,18 @@ int ahci_init(void __iomem *base); int ahci_reset(void __iomem *base); /** - * achi_init_one_dm() - set up a single AHCI port + * ahci_init_one_dm() - set up a single AHCI port * * @dev: Controller to init */ -int achi_init_one_dm(struct udevice *dev); +int ahci_init_one_dm(struct udevice *dev); /** - * achi_start_ports_dm() - start all AHCI ports for a controller + * ahci_start_ports_dm() - start all AHCI ports for a controller * * @dev: Controller containing ports to start */ -int achi_start_ports_dm(struct udevice *dev); +int ahci_start_ports_dm(struct udevice *dev); /** * ahci_init_dm() - init AHCI for a controller, finding all ports