public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	"\"Richard Röjfors\"" <richard.rojfors@pelagicore•com>
Subject: Re: linux-next: build failure after merge of the final tree (v4l-dvb tree related)
Date: Tue, 7 Dec 2010 14:18:09 +1100	[thread overview]
Message-ID: <20101207141809.a305b8d5.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20101123133807.ecadba39.sfr@canb.auug.org.au>

Hi Mauro,

On Tue, 23 Nov 2010 13:38:07 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/media/video/timblogiw.c: In function 'timblogiw_probe':
> drivers/media/video/timblogiw.c:749: error: timblogiw_ioctl_ops causes a section type conflict
> 
> Caused by commit ef6ce9acc5f87e253c97dfd5301f8036f937f595 ("[media]
> [1/2,v4] media: Add timberdale video-in driver") which declared some
> structs as const and __devinitdata.  They should use __devinitconst.

I am still getting this ...

This is the patch that I am applying:

From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 23 Nov 2010 13:35:17 +1100
Subject: [PATCH] media: const and __devinitdata do not mix

This fixes the following error in PowerPC builds:

drivers/media/video/timblogiw.c: In function 'timblogiw_probe':
drivers/media/video/timblogiw.c:749: error: timblogiw_ioctl_ops causes a section type conflict

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 drivers/media/video/timblogiw.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
index bddcdb6..cf48aa9 100644
--- a/drivers/media/video/timblogiw.c
+++ b/drivers/media/video/timblogiw.c
@@ -746,7 +746,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
 
 /* Platform device functions */
 
-static const __devinitdata struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
+static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
 	.vidioc_querycap		= timblogiw_querycap,
 	.vidioc_enum_fmt_vid_cap	= timblogiw_enum_fmt,
 	.vidioc_g_fmt_vid_cap		= timblogiw_g_fmt,
@@ -768,7 +768,7 @@ static const __devinitdata struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
 	.vidioc_enum_framesizes		= timblogiw_enum_framesizes,
 };
 
-static const __devinitdata struct v4l2_file_operations timblogiw_fops = {
+static __devinitconst struct v4l2_file_operations timblogiw_fops = {
 	.owner		= THIS_MODULE,
 	.open		= timblogiw_open,
 	.release	= timblogiw_close,
@@ -778,7 +778,7 @@ static const __devinitdata struct v4l2_file_operations timblogiw_fops = {
 	.poll		= timblogiw_poll,
 };
 
-static const __devinitdata struct video_device timblogiw_template = {
+static __devinitconst struct video_device timblogiw_template = {
 	.name		= TIMBLOGIWIN_NAME,
 	.fops		= &timblogiw_fops,
 	.ioctl_ops	= &timblogiw_ioctl_ops,
-- 
1.7.2.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

  reply	other threads:[~2010-12-07  3:18 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-23  2:38 linux-next: build failure after merge of the final tree (v4l-dvb tree related) Stephen Rothwell
2010-12-07  3:18 ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-07-08  5:26 Stephen Rothwell
2013-07-08 12:58 ` Mauro Carvalho Chehab
2013-07-09  7:03   ` Stephen Rothwell
2013-03-26  6:18 Stephen Rothwell
2013-03-26 12:04 ` Mauro Carvalho Chehab
2013-03-26 23:52   ` Stephen Rothwell
2013-03-27 11:11     ` Stephen Rothwell
2010-10-19  7:07 Stephen Rothwell
2010-10-21 10:53 ` Mauro Carvalho Chehab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101207141809.a305b8d5.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mchehab@redhat$(echo .)com \
    --cc=richard.rojfors@pelagicore$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox