IB/qib: Remove set-but-not-used variables (2055d1f0) · Commits · 戴 / test

drivers/infiniband/hw/qib/qib_diag.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -761,7 +761,6 @@ static ssize_t qib_diag_read(struct file fp, char __user data,
		{
		struct qib_diag_client *dc = fp->private_data;
		struct qib_devdata *dd = dc->dd;
		void __iomem *kreg_base;
		ssize_t ret;

		if (dc->pid != current->pid) {
		@@ -769,8 +768,6 @@ static ssize_t qib_diag_read(struct file fp, char __user data,
		goto bail;
		}

		kreg_base = dd->kregbase;

		if (count == 0)
		ret = 0;
		else if ((count % 4) \|\| (*off % 4))
		@@ -838,7 +835,6 @@ static ssize_t qib_diag_write(struct file fp, const char __user data,
		{
		struct qib_diag_client *dc = fp->private_data;
		struct qib_devdata *dd = dc->dd;
		void __iomem *kreg_base;
		ssize_t ret;

		if (dc->pid != current->pid) {
		@@ -846,8 +842,6 @@ static ssize_t qib_diag_write(struct file fp, const char __user data,
		goto bail;
		}

		kreg_base = dd->kregbase;

		if (count == 0)
		ret = 0;
		else if ((count % 4) \|\| (*off % 4))

+0 −9

Original line number	Diff line number	Diff line
		@@ -696,15 +696,8 @@ static void qib_clean_part_key(struct qib_ctxtdata *rcd,
		struct qib_devdata *dd)
		{
		int i, j, pchanged = 0;
		u64 oldpkey;
		struct qib_pportdata *ppd = rcd->ppd;

		/* for debugging only */
		oldpkey = (u64) ppd->pkeys[0] \|
		((u64) ppd->pkeys[1] << 16) \|
		((u64) ppd->pkeys[2] << 32) \|
		((u64) ppd->pkeys[3] << 48);

		for (i = 0; i < ARRAY_SIZE(rcd->pkeys); i++) {
		if (!rcd->pkeys[i])
		continue;
		@@ -1817,7 +1810,6 @@ static int qib_close(struct inode in, struct file fp)
		struct qib_devdata *dd;
		unsigned long flags;
		unsigned ctxt;
		pid_t pid;

		mutex_lock(&qib_mutex);

		@@ -1859,7 +1851,6 @@ static int qib_close(struct inode in, struct file fp)
		spin_lock_irqsave(&dd->uctxt_lock, flags);
		ctxt = rcd->ctxt;
		dd->rcd[ctxt] = NULL;
		pid = rcd->pid;
		rcd->pid = 0;
		spin_unlock_irqrestore(&dd->uctxt_lock, flags);

+0 −2

Original line number	Diff line number	Diff line
		@@ -1903,7 +1903,6 @@ static void qib_6120_put_tid_2(struct qib_devdata dd, u64 __iomem tidptr,
		u32 type, unsigned long pa)
		{
		u32 __iomem tidp32 = (u32 __iomem )tidptr;
		u32 tidx;

		if (!dd->kregbase)
		return;
		@@ -1927,7 +1926,6 @@ static void qib_6120_put_tid_2(struct qib_devdata dd, u64 __iomem tidptr,
		else /* for now, always full 4KB page */
		pa \|= 2 << 29;
		}
		tidx = tidptr - dd->egrtidbase;
		writel(pa, tidp32);
		mmiowb();
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -3514,7 +3514,6 @@ static void autoneg_7220_work(struct work_struct *work)
		{
		struct qib_pportdata *ppd;
		struct qib_devdata *dd;
		u64 startms;
		u32 i;
		unsigned long flags;

		@@ -3522,8 +3521,6 @@ static void autoneg_7220_work(struct work_struct *work)
		autoneg_work.work)->pportdata;
		dd = ppd->dd;

		startms = jiffies_to_msecs(jiffies);

		/*
		* Busy wait for this first part, it should be at most a
		* few hundred usec, since we scheduled ourselves for 2msec.

+4 −11

Original line number	Diff line number	Diff line
		@@ -3431,7 +3431,6 @@ try_intx:
		for (i = 0; msixnum < dd->cspec->num_msix_entries; i++) {
		irq_handler_t handler;
		void *arg;
		u64 val;
		int lsb, reg, sh;
		#ifdef CONFIG_INFINIBAND_QIB_DCA
		int dca = 0;
		@@ -3502,7 +3501,7 @@ try_intx:
		mask &= ~(1ULL << lsb);
		redirect[reg] \|= ((u64) msixnum) << sh;
		}
		val = qib_read_kreg64(dd, 2 * msixnum + 1 +
		qib_read_kreg64(dd, 2 * msixnum + 1 +
		(QIB_7322_MsixTable_OFFS / sizeof(u64)));
		if (firstcpu < nr_cpu_ids &&
		zalloc_cpumask_var(
		@@ -5358,16 +5357,11 @@ static void try_7322_autoneg(struct qib_pportdata *ppd)
		static void autoneg_7322_work(struct work_struct *work)
		{
		struct qib_pportdata *ppd;
		struct qib_devdata *dd;
		u64 startms;
		u32 i;
		unsigned long flags;

		ppd = container_of(work, struct qib_chippport_specific,
		autoneg_work.work)->ppd;
		dd = ppd->dd;

		startms = jiffies_to_msecs(jiffies);

		/*
		* Busy wait for this first part, it should be at most a
		@@ -7807,13 +7801,12 @@ static void ibsd_wr_allchans(struct qib_pportdata *ppd, int addr, unsigned data,
		{
		struct qib_devdata *dd = ppd->dd;
		int chan;
		u32 rbc;

		for (chan = 0; chan < SERDES_CHANS; ++chan) {
		ahb_mod(dd, IBSD(ppd->hw_pidx), (chan + (chan >> 1)), addr,
		data, mask);
		rbc = ahb_mod(dd, IBSD(ppd->hw_pidx), (chan + (chan >> 1)),
		addr, 0, 0);
		ahb_mod(dd, IBSD(ppd->hw_pidx), (chan + (chan >> 1)), addr,
		0, 0);
		}
		}