[ifmgmt] Optimise prototype for ifcommon_exec()

ifcommon_exec() was long-ago marked as __attribute__((regparm(2))) in
order to minimise the size of functions that call into it.  Since
then, gPXE has added -mregparm=3 as a general compilation option, and
this "optimisation" is now counter-productive.

Change (and simplify) the prototype to minimise code size given the
current compilation conditions.

diff --git a/src/hci/commands/ifmgmt_cmd.c b/src/hci/commands/ifmgmt_cmd.c
index b5f42056262f88a10f10e2d5e42c095961e8fb2a..1b1b10f0853e41ae3d6318499eafe9ed8ea7ac41 100644 (file)
--- a/src/hci/commands/ifmgmt_cmd.c
+++ b/src/hci/commands/ifmgmt_cmd.c
@@ -98,15 +98,15 @@ static int ifcommon_do_list ( int ( * payload ) ( struct net_device * ),
 /**
  * Execute if<xxx> command
  *
- * @v payload          Command to execute
- * @v verb             Verb describing the action of the command
  * @v argc             Argument count
  * @v argv             Argument list
+ * @v payload          Command to execute
+ * @v verb             Verb describing the action of the command
  * @ret rc             Exit code
  */
-__attribute__ (( regparm ( 2 ) )) int
-ifcommon_exec ( int ( * payload ) ( struct net_device * ),
-               const char *verb, int argc, char **argv ) {
+int ifcommon_exec ( int argc, char **argv,
+                   int ( * payload ) ( struct net_device * ),
+                   const char *verb ) {
        int c;
 
        /* Parse options */
@@ -137,7 +137,7 @@ static int ifopen_payload ( struct net_device *netdev ) {
 }
 
 static int ifopen_exec ( int argc, char **argv ) {
-       return ifcommon_exec ( ifopen_payload, "Open", argc, argv );
+       return ifcommon_exec ( argc, argv, ifopen_payload, "Open" );
 }
 
 /* "ifclose" command */
@@ -148,7 +148,7 @@ static int ifclose_payload ( struct net_device *netdev ) {
 }
 
 static int ifclose_exec ( int argc, char **argv ) {
-       return ifcommon_exec ( ifclose_payload, "Close", argc, argv );
+       return ifcommon_exec ( argc, argv, ifclose_payload, "Close" );
 }
 
 /* "ifstat" command */
@@ -159,8 +159,8 @@ static int ifstat_payload ( struct net_device *netdev ) {
 }
 
 static int ifstat_exec ( int argc, char **argv ) {
-       return ifcommon_exec ( ifstat_payload, "Display status of",
-                              argc, argv );
+       return ifcommon_exec ( argc, argv,
+                              ifstat_payload, "Display status of" );
 }
 
 /** Interface management commands */

diff --git a/src/hci/commands/ifmgmt_cmd.h b/src/hci/commands/ifmgmt_cmd.h
index ead128fed0a2b11f5ee52258691a21d24afd9da3..e9c810ab76dcd9e6e1870a053008e406ebe62cbb 100644 (file)
--- a/src/hci/commands/ifmgmt_cmd.h
+++ b/src/hci/commands/ifmgmt_cmd.h
@@ -23,8 +23,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 struct net_device;
 
-extern int ifcommon_exec ( int ( * payload ) ( struct net_device * ),
-                          const char *verb, int argc, char **argv )
-       __attribute__ (( regparm ( 2 ) ));
+extern int ifcommon_exec (  int argc, char **argv,
+                           int ( * payload ) ( struct net_device * ),
+                           const char *verb );
 
 #endif /* _IFMGMT_CMD_H */