aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vc04_services/bcm2835-camera
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2018-05-14 08:44:11 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-14 11:26:02 +0200
commit4f566194cec37d5abe0a18f9d9bb013b4bc3496b (patch)
tree0daac7589000c833028300839b556ef900a01053 /drivers/staging/vc04_services/bcm2835-camera
parentstaging: wlan-ng: fix block comment alignment in p80211metastruct.h (diff)
downloadlinux-dev-4f566194cec37d5abe0a18f9d9bb013b4bc3496b.tar.xz
linux-dev-4f566194cec37d5abe0a18f9d9bb013b4bc3496b.zip
staging: bcm2835-camera: Fix module section mismatch warnings.
Noticed by Stephen Rothwell in -next. Signed-off-by: Eric Anholt <eric@anholt.net> Fixes: 4bebb0312ea9 ("staging/bcm2835-camera: Set ourselves up as a platform driver.") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services/bcm2835-camera')
-rw-r--r--drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 53f33fb3998b..ce26741ae9d9 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -1548,7 +1548,7 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
#define MAX_SUPPORTED_ENCODINGS 20
/* MMAL instance and component init */
-static int __init mmal_init(struct bm2835_mmal_dev *dev)
+static int mmal_init(struct bm2835_mmal_dev *dev)
{
int ret;
struct mmal_es_format_local *format;
@@ -1756,8 +1756,8 @@ unreg_mmal:
return ret;
}
-static int __init bm2835_mmal_init_device(struct bm2835_mmal_dev *dev,
- struct video_device *vfd)
+static int bm2835_mmal_init_device(struct bm2835_mmal_dev *dev,
+ struct video_device *vfd)
{
int ret;
@@ -1836,7 +1836,7 @@ static struct v4l2_format default_v4l2_format = {
.fmt.pix.sizeimage = 1024 * 768,
};
-static int __init bcm2835_mmal_probe(struct platform_device *pdev)
+static int bcm2835_mmal_probe(struct platform_device *pdev)
{
int ret;
struct bm2835_mmal_dev *dev;