From e01b1808b33a937d1f61613eb74cbf946222d701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Fri, 14 Jun 2013 21:21:24 +0200
Subject: [PATCH] ahci: fixed typo and narrowing conversion warning.

* completition -> completion.
---
 src/add-ons/kernel/busses/scsi/ahci/ahci.c           | 2 +-
 src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp    | 8 ++++----
 src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp | 4 ++--
 src/add-ons/kernel/busses/scsi/ahci/sata_request.h   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci.c b/src/add-ons/kernel/busses/scsi/ahci/ahci.c
index aa9e0e33d4..761355b1d6 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci.c
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci.c
@@ -179,7 +179,7 @@ register_sim(device_node *parent)
 			{ SCSI_DESCRIPTION_CONTROLLER_NAME, B_STRING_TYPE,
 				{ string: AHCI_DEVICE_MODULE_NAME }},
 			{ B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { ui32: 255 }},
-			{ AHCI_ID_ITEM, B_UINT32_TYPE, { ui32: id }},
+			{ AHCI_ID_ITEM, B_UINT32_TYPE, { ui32: (uint32)id }},
 //			{ PNP_MANAGER_ID_GENERATOR, B_STRING_TYPE,
 //				{ string: AHCI_ID_GENERATOR }},
 //			{ PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { ui32: id }},
diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp b/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp
index e88a1a4690..ecc84d00eb 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp
@@ -171,7 +171,7 @@ AHCIPort::Uninit()
 	// disable FIS receive
 	fRegs->cmd &= ~PORT_CMD_FER;
 
-	// wait for receive completition, up to 500ms
+	// wait for receive completion, up to 500ms
 	if (wait_until_clear(&fRegs->cmd, PORT_CMD_FR, 500000) < B_OK) {
 		TRACE("AHCIPort::Uninit port %d error FIS rx still running\n", fIndex);
 	}
@@ -179,7 +179,7 @@ AHCIPort::Uninit()
 	// stop DMA engine
 	fRegs->cmd &= ~PORT_CMD_ST;
 
-	// wait for DMA completition
+	// wait for DMA completion
 	if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
 		TRACE("AHCIPort::Uninit port %d error DMA engine still running\n",
 			fIndex);
@@ -565,9 +565,9 @@ AHCIPort::ScsiInquiry(scsi_ccb *request)
 	sreq.set_data(&ataData, sizeof(ataData));
 	sreq.set_ata_cmd(fIsATAPI ? 0xa1 : 0xec); // Identify (Packet) Device
 	ExecuteSataRequest(&sreq);
-	sreq.wait_for_completition();
+	sreq.wait_for_completion();
 
-	if (sreq.completition_status() & ATA_ERR) {
+	if (sreq.completion_status() & ATA_ERR) {
 		TRACE("identify device failed\n");
 		request->subsys_status = SCSI_REQ_CMP_ERR;
 		gSCSI->finished(request, 1);
diff --git a/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp b/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp
index c2750d4938..9bd871b8ed 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp
+++ b/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp
@@ -182,7 +182,7 @@ sata_request::abort()
 
 
 void
-sata_request::wait_for_completition()
+sata_request::wait_for_completion()
 {
 	if (fCcb) panic("wrong usage");
 	acquire_sem(fCompletionSem);
@@ -190,7 +190,7 @@ sata_request::wait_for_completition()
 
 
 int
-sata_request::completition_status()
+sata_request::completion_status()
 {
 	if (fCcb) panic("wrong usage");
 	return fCompletionStatus;
diff --git a/src/add-ons/kernel/busses/scsi/ahci/sata_request.h b/src/add-ons/kernel/busses/scsi/ahci/sata_request.h
index f1efcf271f..71550f6886 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/sata_request.h
+++ b/src/add-ons/kernel/busses/scsi/ahci/sata_request.h
@@ -32,8 +32,8 @@ public:
 	void			finish(int tfd, size_t bytesTransfered);
 	void			abort();
 
-	void			wait_for_completition();
-	int				completition_status();
+	void			wait_for_completion();
+	int				completion_status();
 
 private:
 	scsi_ccb *		fCcb;