Skip to contentSkip to conversation

remove machine specific header file inclusion from driver

PATCH In review Manjunath Hadli 3 participants 6 messages Jan 4, 2012 – Jan 7, 2012

Subsystems (4)
Media (V4L/DVB) Sound ASoC TI DaVinci series media driver
lore
Share & tools
lore

Manjunath Hadli

author
#0 lore raw

v8 cover remove machine specific header file inclusion from driver

remove unnecessary inclusion of machine specific header file from driver which comes in the way of platform code consolidation.

Manjunath Hadli (2):
davinci: vpif: remove machine specific header file inclusion from the
driver
davinci: CQ93VC: remove machine specific header file inclusion from
codec driver

 drivers/media/video/davinci/vpif.h         |    2 --
 drivers/media/video/davinci/vpif_display.c |    2 --
 include/media/davinci/vpif_types.h         |    2 ++
 sound/soc/codecs/cq93vc.c                  |    2 --
 4 files changed, 2 insertions(+), 6 deletions(-)
author
#1 lore raw

PATCH v8 1/2 davinci: vpif: remove machine specific header file inclusion from the driver

remove unnecessary inclusion of machine specific header files mach/dm646x.h, mach/hardware.h from vpif.h and aslo mach/dm646x.h from vpif_display.c driver which comes in the way of platform code consolidation. Add linux/i2c.h header file in vpif_types.h which is required for building.

Signed-off-by Manjunath Hadli <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc LMML <[email protected]>
---
 drivers/media/video/davinci/vpif.h         |    2 --
 drivers/media/video/davinci/vpif_display.c |    2 --
 include/media/davinci/vpif_types.h         |    2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)
drivers/media/video/davinci/vpif.h +0 -2
index 25036cb..8bcac65 100644
@@ -18,8 +18,6 @@
 
 #include <linux/io.h>
 #include <linux/videodev2.h>
-#include <mach/hardware.h>
-#include <mach/dm646x.h>
 #include <media/davinci/vpif_types.h>
 
 /* Maximum channel allowed */
drivers/media/video/davinci/vpif_display.c +0 -2
index 286f029..7fa34b4 100644
@@ -39,8 +39,6 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-chip-ident.h>
 
-#include <mach/dm646x.h>
-
 #include "vpif_display.h"
 #include "vpif.h"
include/media/davinci/vpif_types.h +2 -0
index 9929b05..bd8217c 100644
@@ -17,6 +17,8 @@
 #ifndef _VPIF_TYPES_H
 #define _VPIF_TYPES_H
 
+#include <linux/i2c.h>
+
 #define VPIF_CAPTURE_MAX_CHANNELS	2
 
 enum vpif_if_type {
Signature · 1 line
1.6.2.4
#2 lore raw

PATCH v8 1/2 davinci: vpif: remove machine specific header file inclusion from the driver

Hello.

Quoted 5 lines · Manjunath Hadli

remove unnecessary inclusion of machine specific header files mach/dm646x.h, mach/hardware.h from vpif.h and aslo mach/dm646x.h from vpif_display.c driver which comes in the way of platform code consolidation. Add linux/i2c.h header file in vpif_types.h which is required for building.

This last modification should be in a separate patch. Don;t mix changes
having the different purpose.

Quoted 3 lines
Signed-off-by Manjunath Hadli<[email protected]>
Cc Mauro Carvalho Chehab<[email protected]>
Cc LMML<[email protected]>

WBR, Sergei

author
#3 lore raw

PATCH v8 1/2 davinci: vpif: remove machine specific header file inclusion from the driver

Sergei,

Quoted 11 lines · Sergei Shtylyov

Hello.

Quoted 5 lines · Manjunath Hadli

remove unnecessary inclusion of machine specific header files mach/dm646x.h, mach/hardware.h from vpif.h and aslo mach/dm646x.h from vpif_display.c driver which comes in the way of platform code consolidation. Add linux/i2c.h header file in vpif_types.h which is required for building.

This last modification should be in a separate patch. Don;t mix changes having the different purpose.

It is part of the same modification of removing the machine specific header. When the header file was removed, it needed the i2c to be included due to a dependency and hence the inclusion.

Thx,
-Manju

Quoted 7 lines
Quoted 4 lines
Signed-off-by Manjunath Hadli<[email protected]>
Cc Mauro Carvalho Chehab<[email protected]>
Cc LMML<[email protected]>

WBR, Sergei

author
#4 lore raw

PATCH v8 2/2 davinci: CQ93VC: remove machine specific header file inclusion from codec driver

In reply to Manjunath Hadli

remove unnecessary inclusion of machine specific header file mach/dm365.h from cq93vc.c voice codec driver which comes in the way of platform code consolidation.

Signed-off-by Manjunath Hadli <[email protected]>
Cc Miguel Aguilar <[email protected]>
Cc Jaroslav Kysela <[email protected]>
CC Takashi Iwai <[email protected]>
Cc <[email protected]>
Cc <[email protected]>
---
 sound/soc/codecs/cq93vc.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
sound/soc/codecs/cq93vc.c +0 -2
index 46dbfd0..ff4eb7a 100644
@@ -38,8 +38,6 @@
 #include <sound/soc.h>
 #include <sound/initval.h>
 
-#include <mach/dm365.h>
-
 static inline unsigned int cq93vc_read(struct snd_soc_codec *codec,
 						unsigned int reg)
 {
Signature · 1 line
1.6.2.4
#5 lore raw

Re: [PATCH v8 2/2] davinci: CQ93VC: remove machine specific header file inclusion from codec driver

Quoted 3 lines · Manjunath Hadli

remove unnecessary inclusion of machine specific header file mach/dm365.h from cq93vc.c voice codec driver which comes in the way of platform code consolidation.

*Always* CC maintainers on patches. If you send me a copy directly this looks OK.