From 15765ff7147e9ca45079c1a5e37c35052d57381a Mon Sep 17 00:00:00 2001 From: Benjamin Mugnier Date: Wed, 12 Jun 2024 10:21:14 +0200 Subject: [PATCH] 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 Acked-by: Krzysztof Kozlowski Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil --- Documentation/userspace-api/media/drivers/index.rst | 2 +- .../media/drivers/{st-vgxy61.rst => vgxy61.rst} | 0 MAINTAINERS | 6 +++--- drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/Makefile | 2 +- drivers/media/i2c/{st-vgxy61.c => vgxy61.c} | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename Documentation/userspace-api/media/drivers/{st-vgxy61.rst => vgxy61.rst} (100%) rename drivers/media/i2c/{st-vgxy61.c => vgxy61.c} (99%) diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst index 2252063593bf..d706cb47b112 100644 --- 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 9caf669234f2..313624f0bd7e 100644 --- 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 @@ -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 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 5498128773c7..f336b622e5b8 100644 --- 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 d1403e3273ca..c36f5d1d7f18 100644 --- 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 b9e7c57027b1..30378e962016 100644 --- 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, }, -- 2.50.1