Skip to contentSkip to conversation

IrDA header move

PATCH In review Jean Tourrilhes 2 participants 2 messages Apr 8, 2004 – Apr 9, 2004 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 IrDA header move

Hi Dave,

The attached shell script+patch move some IrDA driver headers
around.
I've always been annoyed that some IrDA driver headers are not
together with the IrDA drivers (like for any other Linux driver), but instead they are part of the main IrDA stack. Moreover, some driver headers are in the IrDA driver directory, so it's not even consistent. This patch fixes that.
The patch also remove two obsolete driver headers. When the
corresponding drivers were remove from the kernel a few months ago, their headers were left behind. This is clearly a consequence of their illogical location.

The patch comes as a shell script and a patch. You just need
to run the script in the linux directory, and apply the patch. Jeff told me that this solution was better because BK can keep track of file move. If you don't like that, I can send you the massive patch.
Would you mind that to push that to Linus ?

Thanks in advance...

Jean

-------------------------------------------------------------------
#!/bin/sh

# Remove obsolete driver header
rm include/net/irda/smc-ircc.h
rm include/net/irda/toshoboe.h

# Move current driver headers with their friends mv include/net/irda/ali-ircc.h drivers/net/irda/ mv include/net/irda/au1000_ircc.h drivers/net/irda/ mv include/net/irda/irda-usb.h drivers/net/irda/ mv include/net/irda/irport.h drivers/net/irda/ mv include/net/irda/nsc-ircc.h drivers/net/irda/ mv include/net/irda/vlsi_ir.h drivers/net/irda/ mv include/net/irda/w83977af.h drivers/net/irda/ mv include/net/irda/w83977af_ir.h drivers/net/irda/
-------------------------------------------------------------------

drivers/net/irda/ali-ircc.c renamed from drivers/net/irda/ali-ircc.d1.c +1 -1
diff -u -p linux/drivers/net/irda/ali-ircc.d1.c linux/drivers/net/irda/ali-ircc.c
@@ -44,7 +44,7 @@
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
 
-#include <net/irda/ali-ircc.h>
+#include "ali-ircc.h"
 
 #define CHIP_IO_EXTENT 8
 #define BROKEN_DONGLE_ID
drivers/net/irda/au1k_ir.c renamed from drivers/net/irda/au1k_ir.d1.c +1 -1
diff -u -p linux/drivers/net/irda/au1k_ir.d1.c linux/drivers/net/irda/au1k_ir.c
@@ -52,7 +52,7 @@
 #include <net/irda/irmod.h>
 #include <net/irda/wrapper.h>
 #include <net/irda/irda_device.h>
-#include "net/irda/au1000_ircc.h"
+#include "au1000_ircc.h"
 
 static int au1k_irda_net_init(struct net_device *);
 static int au1k_irda_start(struct net_device *);
drivers/net/irda/irda-usb.c renamed from drivers/net/irda/irda-usb.d1.c +1 -1
diff -u -p linux/drivers/net/irda/irda-usb.d1.c linux/drivers/net/irda/irda-usb.c
@@ -62,7 +62,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/usb.h>
 
-#include <net/irda/irda-usb.h>
+#include "irda-usb.h"
 
 /*------------------------------------------------------------------*/
 
drivers/net/irda/irport.c renamed from drivers/net/irda/irport.d1.c +1 -1
diff -u -p linux/drivers/net/irda/irport.d1.c linux/drivers/net/irda/irport.c
@@ -58,7 +58,7 @@
 
 #include <net/irda/irda.h>
 #include <net/irda/wrapper.h>
-#include <net/irda/irport.h>
+#include "irport.h"
 
 #define IO_EXTENT 8
 
drivers/net/irda/nsc-ircc.c renamed from drivers/net/irda/nsc-ircc.d1.c +1 -1
diff -u -p linux/drivers/net/irda/nsc-ircc.d1.c linux/drivers/net/irda/nsc-ircc.c
@@ -63,7 +63,7 @@
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
 
-#include <net/irda/nsc-ircc.h>
+#include "nsc-ircc.h"
 
 #define CHIP_IO_EXTENT 8
 #define BROKEN_DONGLE_ID
drivers/net/irda/vlsi_ir.c renamed from drivers/net/irda/vlsi_ir.d1.c +1 -1
diff -u -p linux/drivers/net/irda/vlsi_ir.d1.c linux/drivers/net/irda/vlsi_ir.c
@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL");
 #include <net/irda/wrapper.h>
 #include <net/irda/crc.h>
 
-#include <net/irda/vlsi_ir.h>
+#include "vlsi_ir.h"
 
 /********************************************************/
 
drivers/net/irda/w83977af_ir.c renamed from drivers/net/irda/w83977af_ir.d1.c +2 -2
diff -u -p linux/drivers/net/irda/w83977af_ir.d1.c linux/drivers/net/irda/w83977af_ir.c
@@ -58,8 +58,8 @@
 #include <net/irda/irda.h>
 #include <net/irda/wrapper.h>
 #include <net/irda/irda_device.h>
-#include <net/irda/w83977af.h>
-#include <net/irda/w83977af_ir.h>
+#include "w83977af.h"
+#include "w83977af_ir.h"
 
 #ifdef  CONFIG_ARCH_NETWINDER            /* Adjust to NetWinder differences */
 #undef  CONFIG_NETWINDER_TX_DMA_PROBLEMS /* Not needed */
#1 lore raw
Quoted 2 lines · On Thu, 8 Apr 2004 16:24:20 -0700 Jean Tourrilhes <[email protected]> wrote:

The attached shell script+patch move some IrDA driver headers
around.

I'll add these changes, thanks a lot Jean.