X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Facpi%2Ftoshiba_acpi.c;h=a073256386e9aa0fe7f6620396c248d826ae0c07;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=508bcb4955da17dd536d424a5ed1a896e4e429ea;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 508bcb495..a07325638 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -115,7 +115,7 @@ is_valid_acpi_path(const char* methodName)
 	acpi_handle handle;
 	acpi_status status;
 
-	status = acpi_get_handle(0, (char*)methodName, &handle);
+	status = acpi_get_handle(NULL, (char*)methodName, &handle);
 	return !ACPI_FAILURE(status);
 }
 
@@ -131,7 +131,7 @@ write_acpi_int(const char* methodName, int val)
 	in_objs[0].type = ACPI_TYPE_INTEGER;
 	in_objs[0].integer.value = val;
 
-	status = acpi_evaluate_object(0, (char*)methodName, &params, 0);
+	status = acpi_evaluate_object(NULL, (char*)methodName, &params, NULL);
 	return (status == AE_OK);
 }
 
@@ -178,7 +178,7 @@ hci_raw(const u32 in[HCI_WORDS], u32 out[HCI_WORDS])
 	results.length = sizeof(out_objs);
 	results.pointer = out_objs;
 
-	status = acpi_evaluate_object(0, (char*)method_hci, &params,
+	status = acpi_evaluate_object(NULL, (char*)method_hci, &params,
 		&results);
 	if ((status == AE_OK) && (out_objs->package.count <= HCI_WORDS)) {
 		for (i = 0; i < out_objs->package.count; ++i) {
@@ -487,8 +487,8 @@ ProcItem proc_items[] =
 	{ "video"	, read_video	, write_video	},
 	{ "fan"		, read_fan	, write_fan	},
 	{ "keys"	, read_keys	, write_keys	},
-	{ "version"	, read_version	, 0		},
-	{ 0		, 0		, 0		},
+	{ "version"	, read_version	, NULL		},
+	{ NULL }
 };
 
 static acpi_status __init