From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, James.Bottomley@HansenPartnership.com,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 17/31] sections: Fix section conflicts in drivers/media
Date: Sat, 18 Aug 2012 10:30:08 -0700 [thread overview]
Message-ID: <1345311022-26328-18-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1345311022-26328-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
drivers/media/dvb/ddbridge/ddbridge-core.c | 2 +-
drivers/media/dvb/ngene/ngene-cards.c | 2 +-
drivers/media/video/cx88/cx88-alsa.c | 2 +-
drivers/media/video/gspca/jl2005bcd.c | 2 +-
drivers/media/video/timblogiw.c | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
index ebf3f05..b1f3e77 100644
--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
@@ -1679,7 +1679,7 @@ static struct ddb_info ddb_v6 = {
.subvendor = _subvend, .subdevice = _subdev, \
.driver_data = (unsigned long)&_driverdata }
-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
index 72ee8de..eae0c80 100644
--- a/drivers/media/dvb/ngene/ngene-cards.c
+++ b/drivers/media/dvb/ngene/ngene-cards.c
@@ -479,7 +479,7 @@ static struct ngene_info ngene_info_m780 = {
/****************************************************************************/
-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
+static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index dfac6e3..c26de31 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -749,7 +749,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
* Only boards with eeprom and byte 1 at eeprom=1 have it
*/
-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
{0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
{0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
{0, }
diff --git a/drivers/media/video/gspca/jl2005bcd.c b/drivers/media/video/gspca/jl2005bcd.c
index cf9d9fc..6ebe9ec 100644
--- a/drivers/media/video/gspca/jl2005bcd.c
+++ b/drivers/media/video/gspca/jl2005bcd.c
@@ -512,7 +512,7 @@ static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const __devinitconst struct usb_device_id device_table[] = {
{USB_DEVICE(0x0979, 0x0227)},
{}
};
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
index 02194c0..5f6a2cb 100644
--- a/drivers/media/video/timblogiw.c
+++ b/drivers/media/video/timblogiw.c
@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
/* Platform device functions */
-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
+static const __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,
@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
.vidioc_enum_framesizes = timblogiw_enum_framesizes,
};
-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
+static const __devinitconst struct v4l2_file_operations timblogiw_fops = {
.owner = THIS_MODULE,
.open = timblogiw_open,
.release = timblogiw_close,
@@ -777,7 +777,7 @@ static __devinitconst struct v4l2_file_operations timblogiw_fops = {
.poll = timblogiw_poll,
};
-static __devinitconst struct video_device timblogiw_template = {
+static const __devinitconst struct video_device timblogiw_template = {
.name = TIMBLOGIWIN_NAME,
.fops = &timblogiw_fops,
.ioctl_ops = &timblogiw_ioctl_ops,
--
1.7.7.6
next prev parent reply other threads:[~2012-08-18 17:33 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-18 17:29 Const section fixes tree sweep Andi Kleen
2012-08-18 17:29 ` [PATCH 01/31] Disable const sections for PA-RISC Andi Kleen
2012-08-18 21:15 ` Sam Ravnborg
2012-08-19 2:07 ` Andi Kleen
2012-08-19 7:41 ` Sam Ravnborg
2012-08-18 17:29 ` [PATCH 02/31] sections: Fix section conflicts in arch/arm/ Andi Kleen
2012-08-18 17:29 ` [PATCH 03/31] sections: Fix section conflicts in arch/frv Andi Kleen
2012-10-11 12:38 ` Geert Uytterhoeven
2012-10-11 23:20 ` Andi Kleen
2012-10-15 11:13 ` David Howells
2012-08-18 17:29 ` [PATCH 04/31] sections: Fix section conflicts in arch/h8300 Andi Kleen
2012-08-18 17:29 ` [PATCH 05/31] sections: Fix section conflicts in arch/ia64 Andi Kleen
2012-08-18 17:29 ` [PATCH 06/31] sections: Fix section conflicts in arch/mips Andi Kleen
2012-08-18 17:29 ` [PATCH 07/31] sections: Fix section conflicts in arch/powerpc Andi Kleen
2012-08-18 17:29 ` [PATCH 08/31] sections: Fix section conflicts in arch/score Andi Kleen
2012-08-18 17:30 ` [PATCH 09/31] sections: Fix section conflicts in arch/sh Andi Kleen
2012-08-18 17:30 ` [PATCH 10/31] sections: Fix section conflicts in arch/x86 Andi Kleen
2012-08-18 17:30 ` [PATCH 11/31] sections: Fix section conflicts in drivers/atm Andi Kleen
2012-08-18 17:30 ` [PATCH 12/31] sections: Fix section conflicts in drivers/char Andi Kleen
2012-08-18 17:30 ` [PATCH 13/31] sections: Fix section conflicts in drivers/cpufreq Andi Kleen
2012-08-18 17:30 ` [PATCH 14/31] sections: Fix section conflicts in drivers/hwmon Andi Kleen
2012-08-18 23:23 ` Guenter Roeck
2012-08-19 1:59 ` Andi Kleen
2012-08-19 5:12 ` Guenter Roeck
2012-08-18 17:30 ` [PATCH 15/31] sections: Fix section conflicts in drivers/ide Andi Kleen
2012-08-18 17:30 ` [PATCH 16/31] sections: Fix section conflicts in drivers/macintosh Andi Kleen
2012-08-18 17:30 ` Andi Kleen [this message]
2012-08-18 17:30 ` [PATCH 18/31] sections: Fix section conflicts in drivers/mfd Andi Kleen
2012-08-18 17:30 ` [PATCH 19/31] sections: Fix section conflicts in drivers/misc Andi Kleen
2012-08-18 17:30 ` [PATCH 20/31] sections: Fix section conflicts in drivers/mmc Andi Kleen
2012-08-18 17:30 ` [PATCH 21/31] sections: Fix section conflicts in drivers/net Andi Kleen
2012-08-18 17:30 ` [PATCH 22/31] sections: Fix section conflicts in drivers/net/hamradio Andi Kleen
2012-08-18 17:30 ` [PATCH 23/31] sections: Fix section conflicts in drivers/net/wan Andi Kleen
2012-08-18 17:30 ` [PATCH 24/31] sections: Fix section conflicts in drivers/platform/x86 Andi Kleen
2012-08-18 17:30 ` [PATCH 25/31] sections: Fix section conflicts in drivers/scsi Andi Kleen
2012-08-18 17:30 ` [PATCH 26/31] sections: Fix section conflicts in drivers/video Andi Kleen
2012-08-18 17:30 ` [PATCH 27/31] sections: Fix section conflicts in mm/percpu Andi Kleen
2012-08-18 17:30 ` [PATCH 28/31] sections: Fix section conflicts in net/can Andi Kleen
2012-08-18 17:30 ` [PATCH 29/31] sections: Fix section conflicts in net Andi Kleen
2012-08-18 17:30 ` [PATCH 30/31] sections: Fix section conflicts in sound Andi Kleen
2012-08-18 17:30 ` [PATCH 31/31] Fix const sections for crc32 table Andi Kleen
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=1345311022-26328-18-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).