2 files changed, 21 insertions, 15 deletions

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index c6493ad7c0c8..18e85ccdae67 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1169,7 +1169,7 @@ dump_parport_state ("fwd idle", port);
 
 /* GCC is not inlining extern inline function later overwriten to non-inline,
    so we use outlined_ variants here.  */
-static struct parport_operations parport_pc_ops =
+static const struct parport_operations parport_pc_ops =
 {
         .write_data     = parport_pc_write_data,
         .read_data      = parport_pc_read_data,
@@ -1211,10 +1211,11 @@ static struct parport_operations parport_pc_ops =
 static void __devinit show_parconfig_smsc37c669(int io, int key)
 {
         int cr1,cr4,cra,cr23,cr26,cr27,i=0;
-        static const char *modes[]={ "SPP and Bidirectional (PS/2)",    
-                                     "EPP and SPP",
-                                     "ECP",
-                                     "ECP and EPP" };
+        static const char *const modes[]={
+                "SPP and Bidirectional (PS/2)",
+                "EPP and SPP",
+                "ECP",
+                "ECP and EPP" };
 
         outb(key,io);
         outb(key,io);
@@ -1288,7 +1289,7 @@ static void __devinit show_parconfig_smsc37c669(int io, int key)
 static void __devinit show_parconfig_winbond(int io, int key)
 {
         int cr30,cr60,cr61,cr70,cr74,crf0,i=0;
-        static const char *modes[] = {
+        static const char *const modes[] = {
                 "Standard (SPP) and Bidirectional(PS/2)", /* 0 */
                 "EPP-1.9 and SPP",
                 "ECP",
@@ -1297,7 +1298,9 @@ static void __devinit show_parconfig_winbond(int io, int key)
                 "EPP-1.7 and SPP",              /* 5 */
                 "undefined!",
                 "ECP and EPP-1.7" };
-        static char *irqtypes[] = { "pulsed low, high-Z", "follows nACK" };
+        static char *const irqtypes[] = {
+                "pulsed low, high-Z",
+                "follows nACK" };
                 
         /* The registers are called compatible-PnP because the
            register layout is modelled after ISA-PnP, the access
@@ -2396,7 +2399,8 @@ EXPORT_SYMBOL (parport_pc_unregister_port);
 
 /* ITE support maintained by Rich Liu <richliu@poorman.org> */
 static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq,
-                                         int autodma, struct parport_pc_via_data *via)
+                                         int autodma,
+                                         const struct parport_pc_via_data *via)
 {
         short inta_addr[6] = { 0x2A0, 0x2C0, 0x220, 0x240, 0x1E0 };
         struct resource *base_res;
@@ -2524,7 +2528,8 @@ static struct parport_pc_via_data via_8231_data __devinitdata = {
 };
 
 static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
-                                         int autodma, struct parport_pc_via_data *via)
+                                    int autodma,
+                                    const struct parport_pc_via_data *via)
 {
         u8 tmp, tmp2, siofunc;
         u8 ppcontrol = 0;
@@ -2694,8 +2699,9 @@ enum parport_pc_sio_types {
 
 /* each element directly indexed from enum list, above */
 static struct parport_pc_superio {
-        int (*probe) (struct pci_dev *pdev, int autoirq, int autodma, struct parport_pc_via_data *via);
-        struct parport_pc_via_data *via;
+        int (*probe) (struct pci_dev *pdev, int autoirq, int autodma,
+                      const struct parport_pc_via_data *via);
+        const struct parport_pc_via_data *via;
 } parport_pc_superio_info[] __devinitdata = {
         { sio_via_probe, &via_686a_data, },
         { sio_via_probe, &via_8231_data, },
@@ -2828,7 +2834,7 @@ static struct parport_pc_pci {
         /* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
 };
 
-static struct pci_device_id parport_pc_pci_tbl[] = {
+static const struct pci_device_id parport_pc_pci_tbl[] = {
         /* Super-IO onboard chips */
         { 0x1106, 0x0686, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sio_via_686a },
         { 0x1106, 0x8231, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sio_via_8231 },
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index 5c29e8222211..b62aee8de3cb 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -11,9 +11,9 @@
 #include <linux/string.h>
 #include <asm/uaccess.h>
 
-static struct {
-        char *token;
-        char *descr;
+static const struct {
+        const char *token;
+        const char *descr;
 } classes[] = {
         { "",            "Legacy device" },
         { "PRINTER",     "Printer" },