firewire: mark some structs const

[firefly-linux-kernel-4.4.55.git] / drivers / firewire / fw-ohci.c

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 5392a2b13540ac5599cec013dacd627970f33fd6..d3750a2692e970563cf0190f963395daa5b4715d 100644 (file)
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -25,6 +25,8 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/poll.h>
+#include <linux/dma-mapping.h>
+
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
 
@@ -285,8 +287,8 @@ ar_context_init(struct ar_context *ctx, struct fw_ohci *ohci, u32 control_set)
                return -ENOMEM;
 
        if (ctx->descriptor_bus & 0xf)
-               fw_notify("descriptor not 16-byte aligned: 0x%08x\n",
-                         ctx->descriptor_bus);
+               fw_notify("descriptor not 16-byte aligned: 0x%08lx\n",
+                         (unsigned long)ctx->descriptor_bus);
 
        ctx->buffer_bus =
                dma_map_single(ohci->card.device, ctx->buffer,
@@ -1144,7 +1146,7 @@ ohci_queue_iso(struct fw_iso_context *base,
        return 0;
 }
 
-static struct fw_card_driver ohci_driver = {
+static const struct fw_card_driver ohci_driver = {
        .name                   = ohci_driver_name,
        .enable                 = ohci_enable,
        .update_phy_reg         = ohci_update_phy_reg,