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

Commit cf9542aa authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/ipath: Fix some sparse warnings about shadowed symbols 



There are a few places in the ipath driver where a variable is
re-declared within a block where it is already in scope.  Most of these
extra declarations can simply be removed, since the variable from the
outer scope is used in a way so that it does not need to keep its
variable across the block with the re-declaration.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 1d6e658e

drivers/infiniband/hw/ipath/ipath_eeprom.c

+1 −2
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ void ipath_get_eeprom_info(struct ipath_devdata *dd) 
	struct ipath_devdata *dd0 = ipath_lookup(0);



	if (t && dd0->ipath_nguid > 1 && t <= dd0->ipath_nguid) {

		u8 *bguid, oguid;

		u8 oguid;

		dd->ipath_guid = dd0->ipath_guid;

		bguid = (u8 *) & dd->ipath_guid;
@@ -674,7 +674,6 @@ void ipath_get_eeprom_info(struct ipath_devdata *dd) 
		 * elsewhere for backward-compatibility.

		 */

		char *snp = dd->ipath_serial;

		int len;

		memcpy(snp, ifp->if_sprefix, sizeof ifp->if_sprefix);

		snp[sizeof ifp->if_sprefix] = '\0';

		len = strlen(snp);

drivers/infiniband/hw/ipath/ipath_qp.c

+0 −2
Original line number Diff line number Diff line
@@ -855,8 +855,6 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, 
	 * See ipath_mmap() for details.

	 */

	if (udata && udata->outlen >= sizeof(__u64)) {

		int err;



		if (!qp->r_rq.wq) {

			__u64 offset = 0;