Move concat define to the one place that needs it.

include/dev/driver.h

 /*
  * Copyright (c) 2012 Corey Tabaka
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files
  * (the "Software"), to deal in the Software without restriction,
  * including without limitation the rights to use, copy, modify, merge,
  * publish, distribute, sublicense, and/or sell copies of the Software,
  * and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
@@ skipping 50 matching lines @@
     status_t (*suspend)(struct device *dev);
     status_t (*resume)(struct device *dev);
 };
 
 /* describes a driver, one per driver type */
 struct driver {
     const char *type;
     const struct driver_ops *ops;
 };
 
+/* macro-expanding concat */
+#define concat(a, b) __ex_concat(a, b)
+#define __ex_concat(a, b) a ## b
+
 #define DRIVER_EXPORT(type_, ops_) \
     const struct driver concat(__driver_, type_) \
         __ALIGNED(sizeof(void *)) __SECTION(".drivers") = { \
         .type = #type_, \
         .ops = ops_, \
     }
 
 #define DEVICE_INSTANCE(type_, name_, config_) \
     extern struct driver concat(__driver_, type_); \
     struct device concat(__device_, concat(type_, concat(_, name_))) \
@@ skipping 23 matching lines @@
 status_t device_fini_all(void);
 
 status_t device_init(struct device *dev);
 status_t device_fini(struct device *dev);
 
 status_t device_suspend(struct device *dev);
 status_t device_resume(struct device *dev);
 
 #endif