Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (46 commits)
  ide: constify struct ide_dma_ops
  ide: add struct ide_dma_ops (take 3)
  ide: add IDE_HFLAG_SERIALIZE_DMA host flag
  sl82c105: check bridge revision in sl82c105_init_one()
  au1xxx-ide: use ->init_dma method
  palm_bk3710: use ->init_dma method
  sgiioc4: use ->init_dma method
  icside: use ->init_dma method
  ide-pmac: use ->init_dma method
  ide: do complete DMA setup in ->init_dma method (take 2)
  au1xxx-ide: fix MWDMA support
  ide: cleanup ide_setup_dma()
  ide: factor out setting PCI bus-mastering from ide_hwif_setup_dma()
  ide: export ide_allocate_dma_engine()
  ide: move ide_setup_dma() call out from ->init_dma method
  alim15x3: skip DMA initialization completely on revs < 0x20
  pdc202xx_old: remove init_dma_pdc202xx()
  ide: don't display "BIOS" settings in ide_setup_dma()
  ide: remove ->cds field from ide_hwif_t (take 2)
  ide: remove ide_dma_iobase()
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 0f6fb6b72dd9..e4ad26e4fce7 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -55,7 +55,7 @@ struct ide_acpi_hwif_link {
 /* note: adds function name and KERN_DEBUG */
 #ifdef DEBUGGING
 #define DEBPRINT(fmt, args...)  \
-                printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, ## args)
+                printk(KERN_DEBUG "%s: " fmt, __func__, ## args)
 #else
 #define DEBPRINT(fmt, args...)  do {} while (0)
 #endif  /* DEBUGGING */
@@ -309,7 +309,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,
         if (ACPI_FAILURE(status)) {
                 printk(KERN_DEBUG
                        "%s: Run _GTF error: status = 0x%x\n",
-                       __FUNCTION__, status);
+                       __func__, status);
                 goto out;
         }
 
@@ -335,7 +335,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,
             out_obj->buffer.length % REGS_PER_GTF) {
                 printk(KERN_ERR
                        "%s: unexpected GTF length (%d) or addr (0x%p)\n",
-                       __FUNCTION__, out_obj->buffer.length,
+                       __func__, out_obj->buffer.length,
                        out_obj->buffer.pointer);
                 err = -ENOENT;
                 kfree(output.pointer);
@@ -384,7 +384,7 @@ static int taskfile_load_raw(ide_drive_t *drive,
         err = ide_no_data_taskfile(drive, &args);
         if (err)
                 printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n",
-                       __FUNCTION__, err);
+                       __func__, err);
 
         return err;
 }
@@ -422,7 +422,7 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,
 
         if (gtf_length % REGS_PER_GTF) {
                 printk(KERN_ERR "%s: unexpected GTF length (%d)\n",
-                       __FUNCTION__, gtf_length);
+                       __func__, gtf_length);
                 goto out;
         }
 
@@ -547,7 +547,7 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)
                 printk(KERN_ERR
                         "%s: unexpected _GTM length (0x%x)[should be 0x%zx] or "
                         "addr (0x%p)\n",
-                        __FUNCTION__, out_obj->buffer.length,
+                        __func__, out_obj->buffer.length,
                         sizeof(struct GTM_buffer), out_obj->buffer.pointer);
                 return;
         }