On Sun, May 19, 2013 at 09:30:41PM +0300, Dan Carpenter wrote:
> On Sun, May 19, 2013 at 09:44:42AM -0500, Dimitri Sivanich wrote:
> >
> > Since we're here, maybe we should neaten this up a little?
> >
> > Signed-off-by: Dimitri Sivanich <sivan...@sgi.com>
> > ---
> > drivers/misc/sgi-gru/grufault.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > Index: linux/drivers/misc/sgi-gru/grufault.c
> > ===================================================================
> > --- linux.orig/drivers/misc/sgi-gru/grufault.c
> > +++ linux/drivers/misc/sgi-gru/grufault.c
> > @@ -876,8 +876,9 @@ int gru_set_context_option(unsigned long
> > switch (req.op) {
> > case sco_blade_chiplet:
> > /* Select blade/chiplet for GRU context */
> > - if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES ||
> > !gru_base[req.val1] ||
> > - req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) {
> > + if (req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB ||
> > + req.val1 < -1 || req.val1 >= GRU_MAX_BLADES ||
> > + (req.val1 >= 0 && !gru_base[req.val1])) {
> > ret = -EINVAL;
>
> I generally prefer how in the original code all the sub conditions
> were aligned nicely but I will Ack your version as well. Thanks.
>
I guess I'd have to agree. How about this?
Signed-off-by: Dimitri Sivanich <sivan...@sgi.com>
---
drivers/misc/sgi-gru/grufault.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: linux/drivers/misc/sgi-gru/grufault.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grufault.c
+++ linux/drivers/misc/sgi-gru/grufault.c
@@ -876,8 +876,9 @@ int gru_set_context_option(unsigned long
switch (req.op) {
case sco_blade_chiplet:
/* Select blade/chiplet for GRU context */
- if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES ||
!gru_base[req.val1] ||
- req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) {
+ if (req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB ||
+ req.val1 < -1 || req.val1 >= GRU_MAX_BLADES ||
+ (req.val1 >= 0 && !gru_base[req.val1])) {
ret = -EINVAL;
} else {
gts->ts_user_blade_id = req.val1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
