Merge Linus master into drm-next

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / aic7xxx / aic7xxx_core.c

diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 10172a3af1b9c77563be8c2971498525894edea7..c4829d84b335d4afcab21301a84f1b45a1b4052a 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -4464,10 +4464,9 @@ ahc_softc_init(struct ahc_softc *ahc)
        ahc->pause = ahc->unpause | PAUSE; 
        /* XXX The shared scb data stuff should be deprecated */
        if (ahc->scb_data == NULL) {
-               ahc->scb_data = kmalloc(sizeof(*ahc->scb_data), GFP_ATOMIC);
+               ahc->scb_data = kzalloc(sizeof(*ahc->scb_data), GFP_ATOMIC);
                if (ahc->scb_data == NULL)
                        return (ENOMEM);
-               memset(ahc->scb_data, 0, sizeof(*ahc->scb_data));
        }
 
        return (0);
@@ -4780,10 +4779,10 @@ ahc_init_scbdata(struct ahc_softc *ahc)
        SLIST_INIT(&scb_data->sg_maps);
 
        /* Allocate SCB resources */
-       scb_data->scbarray = kmalloc(sizeof(struct scb) * AHC_SCB_MAX_ALLOC, GFP_ATOMIC);
+       scb_data->scbarray = kzalloc(sizeof(struct scb) * AHC_SCB_MAX_ALLOC,
+                               GFP_ATOMIC);
        if (scb_data->scbarray == NULL)
                return (ENOMEM);
-       memset(scb_data->scbarray, 0, sizeof(struct scb) * AHC_SCB_MAX_ALLOC);
 
        /* Determine the number of hardware SCBs and initialize them */
 
@@ -7558,14 +7557,13 @@ ahc_handle_en_lun(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb)
                                return;
                        }
                }
-               lstate = kmalloc(sizeof(*lstate), GFP_ATOMIC);
+               lstate = kzalloc(sizeof(*lstate), GFP_ATOMIC);
                if (lstate == NULL) {
                        xpt_print_path(ccb->ccb_h.path);
                        printk("Couldn't allocate lstate\n");
                        ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
                        return;
                }
-               memset(lstate, 0, sizeof(*lstate));
                status = xpt_create_path(&lstate->path, /*periph*/NULL,
                                         xpt_path_path_id(ccb->ccb_h.path),
                                         xpt_path_target_id(ccb->ccb_h.path),