media: saa7134-go7007: get rid of to_state() function
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 22 Nov 2021 09:53:02 +0000 (09:53 +0000)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 29 Nov 2021 09:15:04 +0000 (10:15 +0100)
This is just an alias for container_of() and it is used only
on a commented code. The commented code actually is an issue that
require fixes, so, move the container_of() call to the commented
code, and drop the unused function.

This way, a fix for the function could be added later without
needing to re-add to_state() function.

This fixes a clang W=1 warning.

Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/pci/saa7134/saa7134-go7007.c

index f319edb39c0ef0e4969e83f06b21ca4042fb5470..da83893ffee952cbe6cf496b45f0aa41c096d37c 100644 (file)
@@ -56,11 +56,6 @@ struct saa7134_go7007 {
        dma_addr_t bottom_dma;
 };
 
-static inline struct saa7134_go7007 *to_state(struct v4l2_subdev *sd)
-{
-       return container_of(sd, struct saa7134_go7007, sd);
-}
-
 static const struct go7007_board_info board_voyager = {
        .flags           = 0,
        .sensor_flags    = GO7007_SENSOR_656 |
@@ -385,7 +380,7 @@ MODULE_FIRMWARE("go7007/go7007tv.bin");
 static int saa7134_go7007_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
 {
 #if 0
-       struct saa7134_go7007 *saa = to_state(sd);
+       struct saa7134_go7007 *saa = container_of(sd, struct saa7134_go7007, sd);
        struct saa7134_dev *dev = saa->dev;
 
        return saa7134_s_std_internal(dev, NULL, norm);