]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
[media] dib8000: Fix some wrong alignments
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 16 Jan 2011 15:02:52 +0000 (13:02 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 21 Mar 2011 23:31:43 +0000 (20:31 -0300)
Something went wrong with the alignments for the if clause at line 2113.
Instead of using one tab for alignments, it used 3 tabs, plus one space
character.

WARNING: suspect code indent for conditional statements (8, 33)
+ if ((state->fe[0]->dtv_property_cache.delivery_system != SYS_ISDBT) ||
[...]
+  int i = 80000;

WARNING: suspect code indent for conditional statements (33, 41)
+  for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
+  dib8000_set_bandwidth(state->fe[index_frontend], fe->dtv_property_cache.bandwidth_hz / 1000);

WARNING: suspect code indent for conditional statements (33, 41)
+  do {
+  msleep(20);

WARNING: suspect code indent for conditional statements (41, 49)
+  for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
+  if (((tune_failed >> index_frontend) & 0x1) == 0) {

WARNING: suspect code indent for conditional statements (49, 57)
+  if (((tune_failed >> index_frontend) & 0x1) == 0) {
+  found = dib8000_autosearch_irq(state->fe[index_frontend]);

WARNING: suspect code indent for conditional statements (41, 49)
+  if ((nbr_pending == 0) && (exit_condition == 0))
+  exit_condition = 1;

Cc: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/frontends/dib8000.c

index 3961fed9da6e0ffd30643ab19560f5e6870332b4..3e20aa8db23baa655e7a942883dfe39c0306f894 100644 (file)
@@ -2134,54 +2134,54 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
                         ((state->fe[0]->dtv_property_cache.layer[1].segment_count == 0) ||
                          ((state->fe[0]->dtv_property_cache.isdbt_layer_enabled & (2 << 0)) == 0)) &&
                         ((state->fe[0]->dtv_property_cache.layer[2].segment_count == 0) || ((state->fe[0]->dtv_property_cache.isdbt_layer_enabled & (3 << 0)) == 0)))) {
                         ((state->fe[0]->dtv_property_cache.layer[1].segment_count == 0) ||
                          ((state->fe[0]->dtv_property_cache.isdbt_layer_enabled & (2 << 0)) == 0)) &&
                         ((state->fe[0]->dtv_property_cache.layer[2].segment_count == 0) || ((state->fe[0]->dtv_property_cache.isdbt_layer_enabled & (3 << 0)) == 0)))) {
-                                int i = 80000;
-                                u8 found = 0;
-                                u8 tune_failed = 0;
-
-                                for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
-                                        dib8000_set_bandwidth(state->fe[index_frontend], fe->dtv_property_cache.bandwidth_hz / 1000);
-                                        dib8000_autosearch_start(state->fe[index_frontend]);
-                                }
-
-                                do {
-                                        msleep(20);
-                                        nbr_pending = 0;
-                                        exit_condition = 0; /* 0: tune pending; 1: tune failed; 2:tune success */
-                                        for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
-                                                if (((tune_failed >> index_frontend) & 0x1) == 0) {
-                                                        found = dib8000_autosearch_irq(state->fe[index_frontend]);
-                                                        switch (found) {
-                                                        case 0: /* tune pending */
-                                                                        nbr_pending++;
-                                                                        break;
-                                                        case 2:
-                                                                        dprintk("autosearch succeed on the frontend%i", index_frontend);
-                                                                        exit_condition = 2;
-                                                                        index_frontend_success = index_frontend;
-                                                                        break;
-                                                        default:
-                                                                        dprintk("unhandled autosearch result");
-                                                        case 1:
-                                                                        dprintk("autosearch failed for the frontend%i", index_frontend);
-                                                                        break;
-                                                        }
-                                                }
-                                        }
-
-                                        /* if all tune are done and no success, exit: tune failed */
-                                        if ((nbr_pending == 0) && (exit_condition == 0))
-                                                exit_condition = 1;
-                                } while ((exit_condition == 0) && i--);
-
-                                if (exit_condition == 1) { /* tune failed */
-                                        dprintk("tune failed");
-                                        return 0;
-                                }
-
-                                dprintk("tune success on frontend%i", index_frontend_success);
-
-                                dib8000_get_frontend(fe, fep);
-                        }
+               int i = 80000;
+               u8 found = 0;
+               u8 tune_failed = 0;
+
+               for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
+                       dib8000_set_bandwidth(state->fe[index_frontend], fe->dtv_property_cache.bandwidth_hz / 1000);
+                       dib8000_autosearch_start(state->fe[index_frontend]);
+               }
+
+               do {
+                       msleep(20);
+                       nbr_pending = 0;
+                       exit_condition = 0; /* 0: tune pending; 1: tune failed; 2:tune success */
+                       for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
+                               if (((tune_failed >> index_frontend) & 0x1) == 0) {
+                                       found = dib8000_autosearch_irq(state->fe[index_frontend]);
+                                       switch (found) {
+                                       case 0: /* tune pending */
+                                                nbr_pending++;
+                                                break;
+                                       case 2:
+                                                dprintk("autosearch succeed on the frontend%i", index_frontend);
+                                                exit_condition = 2;
+                                                index_frontend_success = index_frontend;
+                                                break;
+                                       default:
+                                                dprintk("unhandled autosearch result");
+                                       case 1:
+                                                dprintk("autosearch failed for the frontend%i", index_frontend);
+                                                break;
+                                       }
+                               }
+                       }
+
+                       /* if all tune are done and no success, exit: tune failed */
+                       if ((nbr_pending == 0) && (exit_condition == 0))
+                               exit_condition = 1;
+               } while ((exit_condition == 0) && i--);
+
+               if (exit_condition == 1) { /* tune failed */
+                       dprintk("tune failed");
+                       return 0;
+               }
+
+               dprintk("tune success on frontend%i", index_frontend_success);
+
+               dib8000_get_frontend(fe, fep);
+       }
 
        for (index_frontend = 0, ret = 0; (ret >= 0) && (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++)
                ret = dib8000_tune(state->fe[index_frontend]);
 
        for (index_frontend = 0, ret = 0; (ret >= 0) && (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++)
                ret = dib8000_tune(state->fe[index_frontend]);