4 files changed, 7 insertions, 6 deletions

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 9983e7200210..013c5daddb0b 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -209,7 +209,7 @@ static int do_lo_send_aops(struct loop_device *lo, struct bio_vec *bvec,
 {
         struct file *file = lo->lo_backing_file; /* kudos to NFsckingS */
         struct address_space *mapping = file->f_mapping;
-        struct address_space_operations *aops = mapping->a_ops;
+        const struct address_space_operations *aops = mapping->a_ops;
         pgoff_t index;
         unsigned offset, bv_offs;
         int len, ret;
@@ -783,7 +783,7 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,
 
         error = -EINVAL;
         if (S_ISREG(inode->i_mode) || S_ISBLK(inode->i_mode)) {
-                struct address_space_operations *aops = mapping->a_ops;
+                const struct address_space_operations *aops = mapping->a_ops;
                 /*
                  * If we can't read - sorry. If we only can't write - well,
                  * it's going to be read-only.
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 852b564e903a..1a9dee19efcf 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -707,7 +707,7 @@ static int pf_detect(void)
                         if (pi_init(pf->pi, 0, conf[D_PRT], conf[D_MOD],
                                     conf[D_UNI], conf[D_PRO], conf[D_DLY],
                                     pf_scratch, PI_PF, verbose, pf->name)) {
-                                if (!pf_probe(pf) && pf->disk) {
+                                if (pf->disk && !pf_probe(pf)) {
                                         pf->present = 1;
                                         k++;
                                 } else
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index e64f26ec6140..a9e1c2524c2a 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -190,7 +190,7 @@ static int ramdisk_set_page_dirty(struct page *page)
         return 0;
 }
 
-static struct address_space_operations ramdisk_aops = {
+static const struct address_space_operations ramdisk_aops = {
         .readpage       = ramdisk_readpage,
         .prepare_write  = ramdisk_prepare_write,
         .commit_write   = ramdisk_commit_write,
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index fbddeb4b04a2..10a4aa5fb54d 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1690,9 +1690,10 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         DPRINTK("waiting for probe_comp\n");
         wait_for_completion(&host->probe_comp);
 
-        printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
+        printk(KERN_INFO "%s: pci %s, ports %d, io %llx, irq %u, major %d\n",
                host->name, pci_name(pdev), (int) CARM_MAX_PORTS,
-               pci_resource_start(pdev, 0), pdev->irq, host->major);
+               (unsigned long long)pci_resource_start(pdev, 0),
+                   pdev->irq, host->major);
 
         carm_host_id++;
         pci_set_drvdata(pdev, host);