From 3b14360f5cdbc6f7f5fa434628bbf2dfa8d5b347 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 25 Apr 2005 19:27:25 +0000 Subject: [PATCH] Renamed describe to describe_device for consistency --- src/core/nic.c | 8 ++++---- src/include/dev.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/nic.c b/src/core/nic.c index 166eedd7..993bcad7 100644 --- a/src/core/nic.c +++ b/src/core/nic.c @@ -327,7 +327,7 @@ void nic_disable ( struct nic *nic __unused ) { #endif } -static char * nic_describe ( struct type_dev *type_dev ) { +static char * nic_describe_device ( struct type_dev *type_dev ) { struct nic *nic = ( struct nic * ) type_dev; static char nic_description[] = "MAC 00:00:00:00:00:00"; @@ -340,9 +340,9 @@ static char * nic_describe ( struct type_dev *type_dev ) { * */ struct type_driver nic_driver = { - .name = "NIC", - .type_dev = ( struct type_dev * ) &nic, - .describe = nic_describe, + .name = "NIC", + .type_dev = ( struct type_dev * ) &nic, + .describe_device = nic_describe_device, }; /* Careful. We need an aligned buffer to avoid problems on machines diff --git a/src/include/dev.h b/src/include/dev.h index 1c0fbcd9..5f1d32e1 100644 --- a/src/include/dev.h +++ b/src/include/dev.h @@ -179,7 +179,7 @@ struct type_dev; struct type_driver { char *name; struct type_dev *type_dev; /* single instance */ - char * ( * describe ) ( struct type_dev *type_dev ); + char * ( * describe_device ) ( struct type_dev *type_dev ); }; #define __type_driver __attribute__ (( used, __section__ ( ".drivers.type" ) ))