staging: lustre: Remove DECLARE_LU_VARS macro

This macro was only used in four places to declare two variables.
It saved one line of code, but in our opinion hurt readability.
So we removed the macro, substituting every occurrence with the
declaration of the two variables (like the preprocessor would have done).

Signed-off-by: Fabian Huegel <fabian_huegel@web.de>
Signed-off-by: Christoph Volkert <linux@christoph-volkert.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h
index d2a3680..a5e558b 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd_class.h
+++ b/drivers/staging/lustre/lustre/include/obd_class.h
@@ -489,14 +489,11 @@ static inline int obd_set_info_async(const struct lu_env *env,
  * obd_precleanup() and obd_cleanup() call both lu_device and obd operations.
  */
 
-#define DECLARE_LU_VARS(ldt, d)                 \
-       struct lu_device_type *ldt;       \
-       struct lu_device *d
-
 static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg)
 {
        int rc;
-       DECLARE_LU_VARS(ldt, d);
+       struct lu_device_type *ldt;
+       struct lu_device *d;
 
        ldt = obd->obd_type->typ_lu;
        if (ldt) {
@@ -534,7 +531,8 @@ static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg)
 static inline int obd_precleanup(struct obd_device *obd)
 {
        int rc;
-       DECLARE_LU_VARS(ldt, d);
+       struct lu_device_type *ldt;
+       struct lu_device *d;
 
        rc = obd_check_dev(obd);
        if (rc)
@@ -560,7 +558,8 @@ static inline int obd_precleanup(struct obd_device *obd)
 static inline int obd_cleanup(struct obd_device *obd)
 {
        int rc;
-       DECLARE_LU_VARS(ldt, d);
+       struct lu_device_type *ldt;
+       struct lu_device *d;
 
        rc = obd_check_dev(obd);
        if (rc)
@@ -608,7 +607,8 @@ static inline int
 obd_process_config(struct obd_device *obd, int datalen, void *data)
 {
        int rc;
-       DECLARE_LU_VARS(ldt, d);
+       struct lu_device_type *ldt;
+       struct lu_device *d;
 
        rc = obd_check_dev(obd);
        if (rc)