mirror of https://github.com/torvalds/linux.git
b5dcee225c
Currently, include/media is messy, as it contains both the V4L2 core
headers and some driver-specific headers on the same place. That makes
harder to identify what core headers should be documented and what
headers belong to I2C drivers that are included only by bridge/main
drivers that would require the functions provided by them.
Let's move those i2c specific files to its own subdirectory.
The files to move were produced via the following script:
mkdir include/media/i2c
(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/*/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
for i in include/media/*.h; do n=`basename $i`; (for j in $(git grep -l $n); do dirname $j; done)|sort|uniq|grep -ve '^.$' > list; num=$(wc -l list|cut -d' ' -f1); if [ $num == 1 ]; then if [ "`grep i2c list`" != "" ]; then git mv $i include/media/i2c; fi; fi; done
And the references corrected via this script:
MAIN_DIR="media/"
PREV_DIR="media/"
DIRS="i2c/"
echo "Checking affected files" >&2
for i in $DIRS; do
for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do
n=`basename $j`
git grep -l $n
done
done|sort|uniq >files && (
echo "Handling files..." >&2;
echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\";
(
cd include/$MAIN_DIR;
for j in $DIRS; do
for i in $(ls $j); do
echo "perl -ne 's,(include [\\\"\\<])$PREV_DIR($i)([\\\"\\>]),\1$MAIN_DIR$j\2\3,; print \$_' |\\";
done;
done;
echo "cat > a && mv a \$i; done";
);
echo "Handling documentation..." >&2;
echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\";
(
cd include/$MAIN_DIR;
for j in $DIRS; do
for i in $(ls $j); do
echo " perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\";
done;
done;
echo "cat > a && mv a \$i; done"
);
) >script && . ./script
Merged Sakari Ailus patch that moves smiapp.h to include/media/i2c.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
|
||
|---|---|---|
| .. | ||
| ad9389b.h | ||
| adp1653.h | ||
| adv7183.h | ||
| adv7343.h | ||
| adv7393.h | ||
| adv7511.h | ||
| adv7604.h | ||
| adv7842.h | ||
| ak881x.h | ||
| as3645a.h | ||
| bt819.h | ||
| cs53l32a.h | ||
| cs5345.h | ||
| ir-kbd-i2c.h | ||
| lm3560.h | ||
| lm3646.h | ||
| m5mols.h | ||
| m52790.h | ||
| mt9m032.h | ||
| mt9p031.h | ||
| mt9t001.h | ||
| mt9t112.h | ||
| mt9v011.h | ||
| mt9v022.h | ||
| mt9v032.h | ||
| noon010pc30.h | ||
| ov772x.h | ||
| ov2659.h | ||
| ov7670.h | ||
| ov9650.h | ||
| rj54n1cb0c.h | ||
| s5c73m3.h | ||
| s5k4ecgx.h | ||
| s5k6aa.h | ||
| saa6588.h | ||
| saa7115.h | ||
| saa7127.h | ||
| smiapp.h | ||
| sr030pc30.h | ||
| tc358743.h | ||
| ths7303.h | ||
| tvaudio.h | ||
| tvp514x.h | ||
| tvp5150.h | ||
| tvp7002.h | ||
| tw9910.h | ||
| uda1342.h | ||
| upd64031a.h | ||
| upd64083.h | ||
| wm8775.h | ||