From d5ef3b73188731d6e56a8edcddb20b71522ce533 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Thu, 29 May 2008 03:54:40 +0000
Subject: [PATCH] Some minor style cleanups, and some other changes I managed
 to miss. This gets legacy_sata registering correctly here, and appears to
 work as far as I can tell.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25692 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../busses/ide/legacy_sata/legacy_sata.c      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c b/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
index a8b6fec82a..08f5b0934c 100644
--- a/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
+++ b/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
@@ -14,7 +14,7 @@
 
 #define DRIVER_PRETTY_NAME	"Legacy SATA"
 #define CONTROLLER_NAME		DRIVER_PRETTY_NAME
-#define CONTROLLER_MODULE_NAME	"busses/ide/legacy_sata/device_v1"
+#define CONTROLLER_MODULE_NAME	"busses/ide/legacy_sata/driver_v1"
 #define CHANNEL_MODULE_NAME	"busses/ide/legacy_sata/channel/v1"
 
 #define TRACE(a...)		dprintf(DRIVER_PRETTY_NAME ": " a)
@@ -343,7 +343,7 @@ module_dependency module_dependencies[] = {
 	{}
 };
 
-static ide_controller_interface channel_interface = {
+static ide_controller_interface sChannelInterface = {
 	{
 		{
 			CHANNEL_MODULE_NAME,
@@ -370,22 +370,22 @@ static ide_controller_interface channel_interface = {
 };
 
 
-static driver_module_info controller_interface = {
+static driver_module_info sControllerInterface = {
 	{
 		CONTROLLER_MODULE_NAME,
 		0,
 		NULL
 	},
 
-	.init_driver		= controller_init,
-	.uninit_driver		= controller_uninit,
-	.supports_device	= controller_supports,
-	.register_device	= controller_probe,
-	.device_removed		= controller_removed,
+	.init_driver		= &controller_init,
+	.uninit_driver		= &controller_uninit,
+	.supports_device	= &controller_supports,
+	.register_device	= &controller_probe,
+	.device_removed		= &controller_removed,
 };
 
 module_info *modules[] = {
-	(module_info *)&controller_interface,
-	(module_info *)&channel_interface,
+	(module_info *)&sControllerInterface,
+	(module_info *)&sChannelInterface,
 	NULL
 };