summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Longerbeam2017-12-15 02:04:42 +0100
committerMauro Carvalho Chehab2017-12-15 20:05:29 +0100
commit4dadf0562bccfa244511d4e5211c8b81e9934712 (patch)
treebec0bc6b5efde08667bd27416b01d5385af8d3c5
parentmedia: staging/imx: of: allow for recursing downstream (diff)
downloadkernel-qcow2-linux-4dadf0562bccfa244511d4e5211c8b81e9934712.tar.gz
kernel-qcow2-linux-4dadf0562bccfa244511d4e5211c8b81e9934712.tar.xz
kernel-qcow2-linux-4dadf0562bccfa244511d4e5211c8b81e9934712.zip
media: staging/imx: remove devname string from imx_media_subdev
A separate string for the device name, for DEVNAME async match, was never needed. Just assign the asd device name to the passed platform device name pointer in imx_media_add_async_subdev(). Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/staging/media/imx/imx-media-dev.c3
-rw-r--r--drivers/staging/media/imx/imx-media.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index 09d2deb3734a..ab0617d65e17 100644
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -112,8 +112,7 @@ imx_media_add_async_subdev(struct imx_media_dev *imxmd,
asd->match.fwnode.fwnode = of_fwnode_handle(np);
} else {
asd->match_type = V4L2_ASYNC_MATCH_DEVNAME;
- strncpy(imxsd->devname, devname, sizeof(imxsd->devname));
- asd->match.device_name.name = imxsd->devname;
+ asd->match.device_name.name = devname;
imxsd->pdev = pdev;
}
diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index 08e34f9e2f67..c6cea2746424 100644
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -128,8 +128,6 @@ struct imx_media_subdev {
/* the platform device if this is an IPU-internal subdev */
struct platform_device *pdev;
- /* the devname is needed for async devname match */
- char devname[32];
};
struct imx_media_dev {