media: i2c: vgxy61: Fix device name

Rename 'st-vgxy61' to 'vgxy61', dropping the vendor prefix to follow the
same naming scheme as the vast majority of device drivers.
The device tree binding does not fall into binding rename exceptions and
therefore must not be changed. Keep its legacy name.

Signed-off-by: Benjamin Mugnier <benjamin.mugnier@foss.st.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst
index 2252063593bf3097722142236d30a3a2a8b954d2..d706cb47b1122b6e145a02ab826eb3ecc7997c2b 100644 (file)
--- a/Documentation/userspace-api/media/drivers/index.rst
+++ b/Documentation/userspace-api/media/drivers/index.rst
@@ -35,6 +35,6 @@ For more details see the file COPYING in the source distribution of Linux.
        max2175
        npcm-video
        omap3isp-uapi
-       st-vgxy61
        thp7312
        uvcvideo
+       vgxy61

diff --git a/Documentation/userspace-api/media/drivers/st-vgxy61.rst b/Documentation/userspace-api/media/drivers/vgxy61.rst
similarity index 100%
rename from Documentation/userspace-api/media/drivers/st-vgxy61.rst
rename to Documentation/userspace-api/media/drivers/vgxy61.rst

diff --git a/MAINTAINERS b/MAINTAINERS
index 9caf669234f2bac1acb4c30109224da3344b1953..313624f0bd7e62b34fdff234c869602f507277a5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21212,8 +21212,8 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/i2c/st,st-vgxy61.yaml
-F:     Documentation/userspace-api/media/drivers/st-vgxy61.rst
-F:     drivers/media/i2c/st-vgxy61.c
+F:     Documentation/userspace-api/media/drivers/vgxy61.rst
+F:     drivers/media/i2c/vgxy61.c
 
 ST VL53L0X ToF RANGER(I2C) IIO DRIVER
 M:     Song Qiang <songqiang1304521@gmail.com>
@@ -23549,7 +23549,7 @@ F:      drivers/media/i2c/mt*
 F:     drivers/media/i2c/og*
 F:     drivers/media/i2c/ov*
 F:     drivers/media/i2c/s5*
-F:     drivers/media/i2c/st-vgxy61.c
+F:     drivers/media/i2c/vgxy61.c
 
 VF610 NAND DRIVER
 M:     Stefan Agner <stefan@agner.ch>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 5498128773c70ad3341dc959f837ae33d37af135..f336b622e5b8e29b36d610b15f75a37806c207ad 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -670,7 +670,7 @@ config VIDEO_S5K6A3
          This is a V4L2 sensor driver for Samsung S5K6A3 raw
          camera sensor.
 
-config VIDEO_ST_VGXY61
+config VIDEO_VGXY61
        tristate "ST VGXY61 sensor support"
        select V4L2_CCI_I2C
        depends on OF && GPIOLIB

diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index d1403e3273ca700f80977119899f2d26c950900a..c36f5d1d7f184c3afc956d1dd192d2d2e709755e 100644 (file)
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -127,7 +127,6 @@ obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o
 obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
 obj-$(CONFIG_VIDEO_SONY_BTF_MPX) += sony-btf-mpx.o
 obj-$(CONFIG_VIDEO_ST_MIPID02) += st-mipid02.o
-obj-$(CONFIG_VIDEO_ST_VGXY61) += st-vgxy61.o
 obj-$(CONFIG_VIDEO_TC358743) += tc358743.o
 obj-$(CONFIG_VIDEO_TC358746) += tc358746.o
 obj-$(CONFIG_VIDEO_TDA1997X) += tda1997x.o
@@ -151,6 +150,7 @@ obj-$(CONFIG_VIDEO_TW9910) += tw9910.o
 obj-$(CONFIG_VIDEO_UDA1342) += uda1342.o
 obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
 obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
+obj-$(CONFIG_VIDEO_VGXY61) += vgxy61.o
 obj-$(CONFIG_VIDEO_VP27SMPX) += vp27smpx.o
 obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
 obj-$(CONFIG_VIDEO_WM8739) += wm8739.o

diff --git a/drivers/media/i2c/st-vgxy61.c b/drivers/media/i2c/vgxy61.c
similarity index 99%
rename from drivers/media/i2c/st-vgxy61.c
rename to drivers/media/i2c/vgxy61.c
index b9e7c57027b1b9d31d86f9df5c8b836b94ece6a4..30378e9620166d08f664c77eb79009926c5ac962 100644 (file)
--- a/drivers/media/i2c/st-vgxy61.c
+++ b/drivers/media/i2c/vgxy61.c
@@ -1878,7 +1878,7 @@ static const struct dev_pm_ops vgxy61_pm_ops = {
 
 static struct i2c_driver vgxy61_i2c_driver = {
        .driver = {
-               .name  = "st-vgxy61",
+               .name  = "vgxy61",
                .of_match_table = vgxy61_dt_ids,
                .pm = &vgxy61_pm_ops,
        },