[SCSI] pm8001: misc code cleanup

Add more data to printk's, add some spaces around arithmetic ops and
improve comments.

Signed-off-by: Jack Wang <jack_wang@usish.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 6e1bdd8e680e3b81ad90e4e7dd6b02bdc4de720e..9b44c6f1b10e554525fe54d1f0b928c614d47568 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -2895,7 +2895,8 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb)
        u8 deviceType = pPayload->sas_identify.dev_type;
        port->port_state =  portstate;
        PM8001_MSG_DBG(pm8001_ha,
-               pm8001_printk("HW_EVENT_SAS_PHY_UP \n"));
+               pm8001_printk("HW_EVENT_SAS_PHY_UP port id = %d, phy id = %d\n",
+               port_id, phy_id));
 
        switch (deviceType) {
        case SAS_PHY_UNUSED:
@@ -2969,6 +2970,9 @@ hw_event_sata_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb)
        struct sas_ha_struct *sas_ha = pm8001_ha->sas;
        struct pm8001_phy *phy = &pm8001_ha->phy[phy_id];
        unsigned long flags;
+       PM8001_MSG_DBG(pm8001_ha,
+               pm8001_printk("HW_EVENT_SATA_PHY_UP port id = %d,"
+               " phy id = %d\n", port_id, phy_id));
        port->port_state =  portstate;
        port->port_attached = 1;
        get_lrate_mode(phy, link_rate);
@@ -4058,7 +4062,7 @@ static int pm8001_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,
        struct inbound_queue_table *circularQ;
        int ret;
        u32 opc = OPC_INB_LOCAL_PHY_CONTROL;
-       memset((u8 *)&payload, 0, sizeof(payload));
+       memset(&payload, 0, sizeof(payload));
        circularQ = &pm8001_ha->inbnd_q_tbl[0];
        payload.tag = 1;
        payload.phyop_phyid =

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index e3d4f385dcce99a8e2d4ebf4e2d6665af0eab2ef..7f9c83a76390d61b1724278f229001463f523093 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -819,7 +819,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
                task->task_done = pm8001_task_done;
                task->timer.data = (unsigned long)task;
                task->timer.function = pm8001_tmf_timedout;
-               task->timer.expires = jiffies + PM8001_TASK_TIMEOUT*HZ;
+               task->timer.expires = jiffies + PM8001_TASK_TIMEOUT * HZ;
                add_timer(&task->timer);
 
                res = pm8001_tag_alloc(pm8001_ha, &ccb_tag);

diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index 599601e9fd08f37f450228b0011753d7014dcc7e..8e38ca8cd1016461e9642d4032d579feb6fac6fc 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -59,11 +59,11 @@
 
 #define DRV_NAME               "pm8001"
 #define DRV_VERSION            "0.1.36"
-#define PM8001_FAIL_LOGGING    0x01 /* libsas EH function logging */
+#define PM8001_FAIL_LOGGING    0x01 /* Error message logging */
 #define PM8001_INIT_LOGGING    0x02 /* driver init logging */
 #define PM8001_DISC_LOGGING    0x04 /* discovery layer logging */
 #define PM8001_IO_LOGGING      0x08 /* I/O path logging */
-#define PM8001_EH_LOGGING      0x10 /* Error message logging */
+#define PM8001_EH_LOGGING      0x10 /* libsas EH function logging*/
 #define PM8001_IOCTL_LOGGING   0x20 /* IOCTL message logging */
 #define PM8001_MSG_LOGGING     0x40 /* misc message logging */
 #define pm8001_printk(format, arg...)  printk(KERN_INFO "%s %d:" format,\