Commit 06f2597f authored by Michael J. Ruhl's avatar Michael J. Ruhl Committed by Doug Ledford
Browse files

IB/{rdmavt, hfi1, qib}: Remove get_card_name() downcall 



rdmavt has a down call to client drivers to retrieve a crafted card
name.

This name should be the IB defined name.

Rather than craft the name each time it is needed, simply retrieve
the IB allocated name from the IB device.

Update the function name to reflect its application.

Clean up driver code to match this change.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 5084c8ff

drivers/infiniband/hw/hfi1/driver.c

+0 −8
Original line number Diff line number Diff line
@@ -167,14 +167,6 @@ const char *get_unit_name(int unit) 
	return iname;

}



const char *get_card_name(struct rvt_dev_info *rdi)

{

	struct hfi1_ibdev *ibdev = container_of(rdi, struct hfi1_ibdev, rdi);

	struct hfi1_devdata *dd = container_of(ibdev,

					       struct hfi1_devdata, verbs_dev);

	return get_unit_name(dd->unit);

}



struct pci_dev *get_pci_dev(struct rvt_dev_info *rdi)

{

	struct hfi1_ibdev *ibdev = container_of(rdi, struct hfi1_ibdev, rdi);

drivers/infiniband/hw/hfi1/hfi.h

+0 −1
Original line number Diff line number Diff line
@@ -1972,7 +1972,6 @@ int get_platform_config_field(struct hfi1_devdata *dd, 
			      u32 *data, u32 len);



const char *get_unit_name(int unit);

const char *get_card_name(struct rvt_dev_info *rdi);

struct pci_dev *get_pci_dev(struct rvt_dev_info *rdi);



/*

drivers/infiniband/hw/hfi1/verbs.c

+0 −1
Original line number Diff line number Diff line
@@ -1890,7 +1890,6 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) 
	 * Fill in rvt info object.

	 */

	dd->verbs_dev.rdi.driver_f.port_callback = hfi1_create_port_files;

	dd->verbs_dev.rdi.driver_f.get_card_name = get_card_name;

	dd->verbs_dev.rdi.driver_f.get_pci_dev = get_pci_dev;

	dd->verbs_dev.rdi.driver_f.check_ah = hfi1_check_ah;

	dd->verbs_dev.rdi.driver_f.notify_new_ah = hfi1_notify_new_ah;

drivers/infiniband/hw/qib/qib.h

+0 −1
Original line number Diff line number Diff line
@@ -1429,7 +1429,6 @@ u64 qib_sps_ints(void); 
dma_addr_t qib_map_page(struct pci_dev *, struct page *, unsigned long,

			  size_t, int);

const char *qib_get_unit_name(int unit);

const char *qib_get_card_name(struct rvt_dev_info *rdi);

struct pci_dev *qib_get_pci_dev(struct rvt_dev_info *rdi);



/*

drivers/infiniband/hw/qib/qib_driver.c

+0 −8
Original line number Diff line number Diff line
@@ -89,14 +89,6 @@ const char *qib_get_unit_name(int unit) 
	return iname;

}



const char *qib_get_card_name(struct rvt_dev_info *rdi)

{

	struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi);

	struct qib_devdata *dd = container_of(ibdev,

					      struct qib_devdata, verbs_dev);

	return qib_get_unit_name(dd->unit);

}



struct pci_dev *qib_get_pci_dev(struct rvt_dev_info *rdi)

{

	struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi);

CRA Git | Maintained and supported by SUSTech CRA and CCSE