3 files changed, 2 insertions, 4 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 0e1d24c2ed41..fba1bb0d1758 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -29,8 +29,7 @@
 /* DEVICE_NAME_HALF is really less than half to accommodate slop */
 #define DEVICE_NAME_HALF        __stringify(20)
 #define DEVICE_ID_SIZE          32
-#define BUS_ID_SIZE             KOBJ_NAME_LEN
-
+#define BUS_ID_SIZE             20
 
 struct device;
 struct device_driver;
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 39e709f88aa0..d542faa6cb47 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -26,7 +26,6 @@
 #include <linux/wait.h>
 #include <asm/atomic.h>
 
-#define KOBJ_NAME_LEN                   20
 #define UEVENT_HELPER_PATH_LEN          256
 #define UEVENT_NUM_ENVP                 32      /* number of env pointers */
 #define UEVENT_BUFFER_SIZE              2048    /* buffer for the variables */
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 387e428f1cdf..b9a76c972084 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -733,7 +733,7 @@ struct spi_board_info {
          * controller_data goes to spi_device.controller_data,
          * irq is copied too
          */
-        char            modalias[KOBJ_NAME_LEN];
+        char            modalias[32];
         const void      *platform_data;
         void            *controller_data;
         int             irq;