Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cde10afa authored by Jakub Pawlak's avatar Jakub Pawlak Committed by Doug Ledford
Browse files

IB/hfi1: Correct log message strings 



Remove "IB" keyword from log messages.
Correct comment for thermal sensor init function.

Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarJakub Pawlak <jakub.pawlak@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent cdbff504

drivers/staging/rdma/hfi1/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -14588,7 +14588,7 @@ u64 create_pbc(struct hfi1_pportdata *ppd, u64 flags, int srate_mbs, u32 vl, 
		   (reason), (ret))



/*

 * Initialize the Avago Thermal sensor.

 * Initialize the thermal sensor.

 *

 * After initialization, enable polling of thermal sensor through

 * SBus interface. In order for this to work, the SBus Master

drivers/staging/rdma/hfi1/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ int hfi1_set_lid(struct hfi1_pportdata *ppd, u32 lid, u8 lmc) 
	ppd->lmc = lmc;

	hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_LIDLMC, 0);



	dd_dev_info(dd, "IB%u:%u got a lid: 0x%x\n", dd->unit, ppd->port, lid);

	dd_dev_info(dd, "port %u: got a lid: 0x%x\n", ppd->port, lid);



	return 0;

}

drivers/staging/rdma/hfi1/hfi.h

+2 −3
Original line number Diff line number Diff line
@@ -1883,9 +1883,8 @@ static inline u64 hfi1_pkt_base_sdma_integrity(struct hfi1_devdata *dd) 
		get_unit_name((dd)->unit), ##__VA_ARGS__)



#define hfi1_dev_porterr(dd, port, fmt, ...) \

	dev_err(&(dd)->pcidev->dev, "%s: IB%u:%u " fmt, \

			get_unit_name((dd)->unit), (dd)->unit, (port), \

			##__VA_ARGS__)

	dev_err(&(dd)->pcidev->dev, "%s: port %u: " fmt, \

			get_unit_name((dd)->unit), (port), ##__VA_ARGS__)



/*

 * this is used for formatting hw error messages...

drivers/staging/rdma/hfi1/sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -721,8 +721,8 @@ int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num, 
	}



	dd_dev_info(dd,

		    "IB%u: Congestion Control Agent enabled for port %d\n",

		    dd->unit, port_num);

		    "Congestion Control Agent enabled for port %d\n",

		    port_num);



	return 0;