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

Commit 732bee7a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jiri Kosina
Browse files

fix typos concerning "hierarchy" 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 22c1d8b4

arch/arm/mach-omap2/dpll3xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate) 
	}

	if (!ret) {

		/*

		 * Switch the parent clock in the heirarchy, and make sure

		 * Switch the parent clock in the hierarchy, and make sure

		 * that the new parent's usecount is correct.  Note: we

		 * enable the new parent before disabling the old to avoid

		 * any unnecessary hardware disable->enable transitions.

arch/microblaze/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ ifeq (,$(findstring spartan2,$(CONFIG_XILINX_MICROBLAZE0_FAMILY))) 
  ifeq ($(CPU_MAJOR),3)

    CPUFLAGS-1 += -mno-xl-soft-mul

  else

    # USE_HW_MUL can be 0, 1, or 2, defining a heirarchy of HW Mul support.

    # USE_HW_MUL can be 0, 1, or 2, defining a hierarchy of HW Mul support.

    CPUFLAGS-$(subst 1,,$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL)) += -mxl-multiply-high

    CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL) += -mno-xl-soft-mul

  endif

drivers/infiniband/hw/cxgb3/iwch_qp.c

+2 −2
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag) 
	atomic_inc(&qhp->refcnt);

	spin_unlock_irqrestore(&qhp->lock, *flag);



	/* locking heirarchy: cq lock first, then qp lock. */

	/* locking hierarchy: cq lock first, then qp lock. */

	spin_lock_irqsave(&rchp->lock, *flag);

	spin_lock(&qhp->lock);

	cxio_flush_hw_cq(&rchp->cq);
@@ -827,7 +827,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag) 
	if (flushed)

		(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);



	/* locking heirarchy: cq lock first, then qp lock. */

	/* locking hierarchy: cq lock first, then qp lock. */

	spin_lock_irqsave(&schp->lock, *flag);

	spin_lock(&qhp->lock);

	cxio_flush_hw_cq(&schp->cq);

drivers/infiniband/hw/cxgb4/qp.c

+2 −2
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp, 
	atomic_inc(&qhp->refcnt);

	spin_unlock_irqrestore(&qhp->lock, *flag);



	/* locking heirarchy: cq lock first, then qp lock. */

	/* locking hierarchy: cq lock first, then qp lock. */

	spin_lock_irqsave(&rchp->lock, *flag);

	spin_lock(&qhp->lock);

	c4iw_flush_hw_cq(&rchp->cq);
@@ -910,7 +910,7 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp, 
	if (flushed)

		(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);



	/* locking heirarchy: cq lock first, then qp lock. */

	/* locking hierarchy: cq lock first, then qp lock. */

	spin_lock_irqsave(&schp->lock, *flag);

	spin_lock(&qhp->lock);

	c4iw_flush_hw_cq(&schp->cq);

drivers/scsi/libfc/fc_lport.c

+3 −3
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ 
 * invalid SID. We also need to ensure that states don't change unexpectedly

 * while processing another state.

 *

 * HEIRARCHY

 * HIERARCHY

 *

 * The following heirarchy defines the locking rules. A greater lock

 * The following hierarchy defines the locking rules. A greater lock

 * may be held before acquiring a lesser lock, but a lesser lock should never

 * be held while attempting to acquire a greater lock. Here is the heirarchy-

 * be held while attempting to acquire a greater lock. Here is the hierarchy-

 *

 * lport > disc, lport > rport, disc > rport

 *