From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: Andi Kleen <ak@linux.intel.com>, mchehab@infradead.org
Subject: [PATCH 15/27] Initconst section fixes for media
Date: Thu, 15 Sep 2011 13:09:42 -0700 [thread overview]
Message-ID: <1316117394-21666-16-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1316117394-21666-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Cc: mchehab@infradead.org
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
drivers/media/dvb/ngene/ngene-cards.c | 2 +-
drivers/media/video/cx88/cx88-alsa.c | 2 +-
drivers/media/video/timblogiw.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
index 0564192..75b16f5 100644
--- a/drivers/media/dvb/ngene/ngene-cards.c
+++ b/drivers/media/dvb/ngene/ngene-cards.c
@@ -477,7 +477,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 68d1240..46b32eb 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -766,7 +766,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/timblogiw.c b/drivers/media/video/timblogiw.c
index 84cd1b6..586706b 100644
--- a/drivers/media/video/timblogiw.c
+++ b/drivers/media/video/timblogiw.c
@@ -744,7 +744,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,
@@ -766,7 +766,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,
@@ -776,7 +776,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.4.4
next prev parent reply other threads:[~2011-09-15 20:13 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 20:09 Tree sweep to fix up initconst Andi Kleen
2011-09-15 20:09 ` [PATCH 01/27] Initconst section fixes for ARM Andi Kleen
2011-09-15 20:09 ` [PATCH 02/27] Initconst section fixes for FRV Andi Kleen
2011-09-15 20:09 ` [PATCH 03/27] Initconst section fixes for H8300 Andi Kleen
2011-09-15 20:09 ` [PATCH 04/27] Initconst section fixes for IA64 Andi Kleen
2011-09-15 20:09 ` [PATCH 05/27] Initconst section fixes for M68K Andi Kleen
2011-10-31 18:05 ` Geert Uytterhoeven
2011-09-15 20:09 ` [PATCH 06/27] Initconst section fixes for MIPS Andi Kleen
2011-09-22 16:59 ` Ralf Baechle
2011-09-15 20:09 ` [PATCH 07/27] Initconst section fixes for POWERPC Andi Kleen
2011-09-15 20:45 ` Josh Boyer
2011-09-15 20:48 ` Andi Kleen
2011-09-15 20:56 ` Josh Boyer
2011-09-15 20:57 ` Andi Kleen
2011-09-15 23:04 ` Josh Boyer
2011-09-15 23:10 ` Andi Kleen
2011-09-15 23:26 ` Thomas Gleixner
2011-09-15 21:43 ` Jonathan Nieder
2011-09-15 20:09 ` [PATCH 08/27] Initconst section fixes for SH Andi Kleen
2011-09-15 20:09 ` [PATCH 09/27] Initconst section fixes for X86 Andi Kleen
2011-09-15 20:09 ` [PATCH 10/27] Initconst section fixes for CPUFREQ Andi Kleen
2011-09-15 21:43 ` Dave Jones
2011-09-15 20:09 ` [PATCH 11/27] Initconst section fixes for EDAC Andi Kleen
2011-09-15 20:09 ` [PATCH 12/27] Initconst section fixes for hwmon Andi Kleen
2011-09-15 20:09 ` [PATCH 13/27] Initconst section fixes for IDE Andi Kleen
2011-09-15 21:12 ` David Miller
2011-09-15 20:09 ` [PATCH 14/27] Initconst section fixes for macintosh Andi Kleen
2011-09-15 20:09 ` Andi Kleen [this message]
2011-09-15 20:09 ` [PATCH 16/27] Initconst section fixes for mfd Andi Kleen
2011-09-26 8:48 ` Samuel Ortiz
2011-09-15 20:09 ` [PATCH 17/27] Initconst section fixes for mmc Andi Kleen
2011-09-15 20:09 ` [PATCH 18/27] Initconst section fixes for mtd Andi Kleen
2011-09-15 20:09 ` [PATCH 19/27] Initconst section fixes for drivers/net Andi Kleen
2011-09-15 21:12 ` David Miller
2011-09-15 20:09 ` [PATCH 20/27] Initconst section fixes for SCSI Andi Kleen
2011-09-15 20:18 ` James Bottomley
2011-09-15 20:30 ` Andi Kleen
2011-09-15 20:09 ` [PATCH 21/27] Initconst section fixes for SPI Andi Kleen
2011-09-15 20:57 ` Grant Likely
2011-09-15 20:59 ` Andi Kleen
2011-09-15 20:09 ` [PATCH 22/27] Initconst section fixes for TTY Andi Kleen
2011-09-15 20:09 ` [PATCH 23/27] Initconst section fixes for VIDEO Andi Kleen
2011-09-15 20:09 ` [PATCH 24/27] Initconst section fixes for watchdog Andi Kleen
2011-09-15 20:09 ` [PATCH 25/27] Initconst section fixes for percpu Andi Kleen
2011-09-17 0:41 ` Tejun Heo
2011-09-15 20:09 ` [PATCH 26/27] Initconst section fixes for net Andi Kleen
2011-09-15 21:12 ` David Miller
2011-09-15 20:09 ` [PATCH 27/27] Initconst section fixes for lib Andi Kleen
2011-09-15 23:33 ` Tree sweep to fix up initconst Thomas Gleixner
2011-09-20 15:18 ` [PATCH 02/27] Initconst section fixes for FRV David Howells
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=1316117394-21666-16-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@infradead.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
all inboxes | Powered by JetHome®