Skip to contentSkip to conversation

dma-debug: Remove local BUS_NOTIFY_UNBOUND_DRIVER define

PATCH Applied Shuah Khan 2 participants 2 messages Oct 1, 2012 – Oct 2, 2012 Library code

lore
Share & tools
lore

Shuah Khan

author
#0 lore raw

PATCH 1/1 dma-debug: Remove local BUS_NOTIFY_UNBOUND_DRIVER define

Remove local BUS_NOTIFY_UNBOUND_DRIVER define. This is not used since BUS_NOTIFY_UNBOUND_DRIVER is defined in include/linux/device.h

Signed-off-by Shuah Khan <[email protected]>
---
 lib/dma-debug.c |    5 -----
 1 file changed, 5 deletions(-)
lib/dma-debug.c +0 -5
index 66ce414..b9087bf 100644
@@ -120,11 +120,6 @@ static const char *type2name[4] = { "single", "page",
 static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE",
 				   "DMA_FROM_DEVICE", "DMA_NONE" };
 
-/* little merge helper - remove it after the merge window */
-#ifndef BUS_NOTIFY_UNBOUND_DRIVER
-#define BUS_NOTIFY_UNBOUND_DRIVER 0x0005
-#endif
-
 /*
  * The access to some variables in this macro is racy. We can't use atomic_t
  * here because all these variables are exported to debugfs. Some of them even
Signature · 1 line
1.7.9.5
Applied
#1 lore raw
Quoted 13 lines · Shuah Khan

Remove local BUS_NOTIFY_UNBOUND_DRIVER define. This is not used since BUS_NOTIFY_UNBOUND_DRIVER is defined in include/linux/device.h

Signed-off-by Shuah Khan <[email protected]>
---
 lib/dma-debug.c |    5 -----
 1 file changed, 5 deletions(-)
lib/dma-debug.c +0 -0
index 66ce414..b9087bf 100644

lib/dma-debug.c static const char *type2name[4] = { "single", "page", · line 127

Quoted 8 lines
lib/dma-debug.c +0 -5
@@ -120,11 +120,6 @@ static const char *type2name[4] = { "single", "page",
 static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE",
 				   "DMA_FROM_DEVICE", "DMA_NONE" };
 
-/* little merge helper - remove it after the merge window */
-#ifndef BUS_NOTIFY_UNBOUND_DRIVER
-#define BUS_NOTIFY_UNBOUND_DRIVER 0x0005
-#endif
-

Thanks, applied.

Signature · 5 lines
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632