@@ -245,7 +245,8 @@ static void mptsas_print_device_pg0(SasDevicePage0_t *pg0)
245245 printk ("Parent Handle=0x%X\n" ,le16_to_cpu (pg0 -> ParentDevHandle ));
246246 printk ("Enclosure Handle=0x%X\n" , le16_to_cpu (pg0 -> EnclosureHandle ));
247247 printk ("Slot=0x%X\n" , le16_to_cpu (pg0 -> Slot ));
248- printk ("SAS Address=0x%llX\n" , le64_to_cpu (sas_address ));
248+ printk ("SAS Address=0x%llX\n" , (unsigned long long )
249+ le64_to_cpu (sas_address ));
249250 printk ("Target ID=0x%X\n" , pg0 -> TargetID );
250251 printk ("Bus=0x%X\n" , pg0 -> Bus );
251252 /* The PhyNum field specifies the PHY number of the parent
@@ -349,9 +350,9 @@ mptsas_port_delete(struct mptsas_portinfo_details * port_details)
349350 phy_info = port_info -> phy_info ;
350351
351352 dsaswideprintk ((KERN_DEBUG "%s: [%p]: num_phys=%02d "
352- "bitmask=0x%016llX\n" ,
353- __FUNCTION__ , port_details , port_details -> num_phys ,
354- port_details -> phy_bitmask ));
353+ "bitmask=0x%016llX\n" , __FUNCTION__ , port_details ,
354+ port_details -> num_phys , ( unsigned long long )
355+ port_details -> phy_bitmask ));
355356
356357 for (i = 0 ; i < port_info -> num_phys ; i ++ , phy_info ++ ) {
357358 if (phy_info -> port_details != port_details )
@@ -476,7 +477,7 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
476477 for (i = 0 ; i < port_info -> num_phys ; i ++ , phy_info ++ ) {
477478 sas_address = phy_info -> attached .sas_address ;
478479 dsaswideprintk ((KERN_DEBUG "phy_id=%d sas_address=0x%018llX\n" ,
479- i , sas_address ));
480+ i , ( unsigned long long ) sas_address ));
480481 if (!sas_address )
481482 continue ;
482483 port_details = phy_info -> port_details ;
@@ -495,8 +496,8 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
495496 (1 << phy_info -> phy_id );
496497 phy_info -> sas_port_add_phy = 1 ;
497498 dsaswideprintk ((KERN_DEBUG "\t\tForming port\n\t\t"
498- "phy_id=%d sas_address=0x%018llX\n" ,
499- i , sas_address ));
499+ "phy_id=%d sas_address=0x%018llX\n" ,
500+ i , ( unsigned long long ) sas_address ));
500501 phy_info -> port_details = port_details ;
501502 }
502503
@@ -512,8 +513,9 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
512513 if (phy_info_cmp -> port_details == port_details )
513514 continue ;
514515 dsaswideprintk ((KERN_DEBUG
515- "\t\tphy_id=%d sas_address=0x%018llX\n" ,
516- j , phy_info_cmp -> attached .sas_address ));
516+ "\t\tphy_id=%d sas_address=0x%018llX\n" ,
517+ j , (unsigned long long )
518+ phy_info_cmp -> attached .sas_address ));
517519 if (phy_info_cmp -> port_details ) {
518520 port_details -> rphy =
519521 mptsas_get_rphy (phy_info_cmp );
@@ -546,11 +548,10 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
546548 if (!port_details )
547549 continue ;
548550 dsaswideprintk ((KERN_DEBUG
549- "%s: [%p]: phy_id=%02d num_phys=%02d "
550- "bitmask=0x%016llX\n" ,
551- __FUNCTION__ ,
552- port_details , i , port_details -> num_phys ,
553- port_details -> phy_bitmask ));
551+ "%s: [%p]: phy_id=%02d num_phys=%02d "
552+ "bitmask=0x%016llX\n" , __FUNCTION__ ,
553+ port_details , i , port_details -> num_phys ,
554+ (unsigned long long )port_details -> phy_bitmask ));
554555 dsaswideprintk ((KERN_DEBUG "\t\tport = %p rphy=%p\n" ,
555556 port_details -> port , port_details -> rphy ));
556557 }
@@ -2079,8 +2080,10 @@ mptsas_persist_clear_table(struct work_struct *work)
20792080static void
20802081mptsas_reprobe_lun (struct scsi_device * sdev , void * data )
20812082{
2083+ int rc ;
2084+
20822085 sdev -> no_uld_attach = data ? 1 : 0 ;
2083- scsi_device_reprobe (sdev );
2086+ rc = scsi_device_reprobe (sdev );
20842087}
20852088
20862089static void
0 commit comments