3 files changed, 26 insertions, 30 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index ae8e1a64b8ad..04a357808f2e 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -606,26 +606,24 @@ static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, uns
 {
         struct request *rq = pc->rq;
         struct bio_vec *bvec;
-        struct bio *bio;
+        struct req_iterator iter;
         unsigned long flags;
         char *data;
-        int count, i, done = 0;
+        int count, done = 0;
 
-        rq_for_each_bio(bio, rq) {
-                bio_for_each_segment(bvec, bio, i) {
-                        if (!bcount)
-                                break;
+        rq_for_each_segment(bvec, rq, iter) {
+                if (!bcount)
+                        break;
 
-                        count = min(bvec->bv_len, bcount);
+                count = min(bvec->bv_len, bcount);
 
-                        data = bvec_kmap_irq(bvec, &flags);
-                        drive->hwif->atapi_input_bytes(drive, data, count);
-                        bvec_kunmap_irq(data, &flags);
+                data = bvec_kmap_irq(bvec, &flags);
+                drive->hwif->atapi_input_bytes(drive, data, count);
+                bvec_kunmap_irq(data, &flags);
 
-                        bcount -= count;
-                        pc->b_count += count;
-                        done += count;
-                }
+                bcount -= count;
+                pc->b_count += count;
+                done += count;
         }
 
         idefloppy_do_end_request(drive, 1, done >> 9);
@@ -639,27 +637,25 @@ static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, uns
 static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, unsigned int bcount)
 {
         struct request *rq = pc->rq;
-        struct bio *bio;
+        struct req_iterator iter;
         struct bio_vec *bvec;
         unsigned long flags;
-        int count, i, done = 0;
+        int count, done = 0;
         char *data;
 
-        rq_for_each_bio(bio, rq) {
-                bio_for_each_segment(bvec, bio, i) {
-                        if (!bcount)
-                                break;
+        rq_for_each_segment(bvec, rq, iter) {
+                if (!bcount)
+                        break;
 
-                        count = min(bvec->bv_len, bcount);
+                count = min(bvec->bv_len, bcount);
 
-                        data = bvec_kmap_irq(bvec, &flags);
-                        drive->hwif->atapi_output_bytes(drive, data, count);
-                        bvec_kunmap_irq(data, &flags);
+                data = bvec_kmap_irq(bvec, &flags);
+                drive->hwif->atapi_output_bytes(drive, data, count);
+                bvec_kunmap_irq(data, &flags);
 
-                        bcount -= count;
-                        pc->b_count += count;
-                        done += count;
-                }
+                bcount -= count;
+                pc->b_count += count;
+                done += count;
         }
 
         idefloppy_do_end_request(drive, 1, done >> 9);
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 80013d2bb039..d04b966b4347 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -585,7 +585,7 @@ out:
  *      Cable special cases
  */
 
-static struct dmi_system_id cable_dmi_table[] = {
+static const struct dmi_system_id cable_dmi_table[] = {
         {
                 .ident = "HP Pavilion N5430",
                 .matches = {
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 3611ca6b13b7..378feb491ec4 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -409,7 +409,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
  *      Cable special cases
  */
 
-static struct dmi_system_id cable_dmi_table[] = {
+static const struct dmi_system_id cable_dmi_table[] = {
         {
                 .ident = "Acer Ferrari 3400",
                 .matches = {