Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (276 commits)
  [SCSI] zfcp: Trigger logging in the FCP channel on qdio error conditions
  [SCSI] zfcp: Introduce experimental support for DIF/DIX
  [SCSI] zfcp: Enable data division support for FCP devices
  [SCSI] zfcp: Prevent access on uninitialized memory.
  [SCSI] zfcp: Post events through FC transport class
  [SCSI] zfcp: Cleanup QDIO attachment and improve processing.
  [SCSI] zfcp: Cleanup function parameters for sbal value.
  [SCSI] zfcp: Use correct width for timer_interval field
  [SCSI] zfcp: Remove SCSI device when removing unit
  [SCSI] zfcp: Use memdup_user and kstrdup
  [SCSI] zfcp: Fix retry after failed "open port" erp action
  [SCSI] zfcp: Fail erp after timeout
  [SCSI] zfcp: Use forced_reopen in terminate_rport_io callback
  [SCSI] zfcp: Register SCSI devices after successful fc_remote_port_add
  [SCSI] zfcp: Do not try "forced close" when port is already closed
  [SCSI] zfcp: Do not unblock rport from REOPEN_PORT_FORCED
  [SCSI] sd: add support for runtime PM
  [SCSI] implement runtime Power Management
  [SCSI] convert to the new PM framework
  [SCSI] Unify SAM_ and SAM_STAT_ macros
  ...

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_proc.c b/drivers/scsi/aic7xxx/aic79xx_proc.c
index 014bed716e7c..59c85d5a153a 100644
--- a/drivers/scsi/aic7xxx/aic79xx_proc.c
+++ b/drivers/scsi/aic7xxx/aic79xx_proc.c
@@ -272,33 +272,32 @@ ahd_proc_write_seeprom(struct ahd_softc *ahd, char *buffer, int length)
         saved_modes = ahd_save_modes(ahd);
         ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
         if (length != sizeof(struct seeprom_config)) {
-                printf("ahd_proc_write_seeprom: incorrect buffer size\n");
+                printk("ahd_proc_write_seeprom: incorrect buffer size\n");
                 goto done;
         }
 
         have_seeprom = ahd_verify_cksum((struct seeprom_config*)buffer);
         if (have_seeprom == 0) {
-                printf("ahd_proc_write_seeprom: cksum verification failed\n");
+                printk("ahd_proc_write_seeprom: cksum verification failed\n");
                 goto done;
         }
 
         have_seeprom = ahd_acquire_seeprom(ahd);
         if (!have_seeprom) {
-                printf("ahd_proc_write_seeprom: No Serial EEPROM\n");
+                printk("ahd_proc_write_seeprom: No Serial EEPROM\n");
                 goto done;
         } else {
                 u_int start_addr;
 
                 if (ahd->seep_config == NULL) {
-                        ahd->seep_config = malloc(sizeof(*ahd->seep_config),
-                                                  M_DEVBUF, M_NOWAIT);
+                        ahd->seep_config = kmalloc(sizeof(*ahd->seep_config), GFP_ATOMIC);
                         if (ahd->seep_config == NULL) {
-                                printf("aic79xx: Unable to allocate serial "
+                                printk("aic79xx: Unable to allocate serial "
                                        "eeprom buffer.  Write failing\n");
                                 goto done;
                         }
                 }
-                printf("aic79xx: Writing Serial EEPROM\n");
+                printk("aic79xx: Writing Serial EEPROM\n");
                 start_addr = 32 * (ahd->channel - 'A');
                 ahd_write_seeprom(ahd, (u_int16_t *)buffer, start_addr,
                                   sizeof(struct seeprom_config)/2);