Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] saa7134: fix CodingStyle issues on the lines touched by pr_foo refactor

Several lines touched by the pr_foo refactoring patches are not
following the Linux Coding style.

While we won't be fixing the style globally at the driver, we should,
at least, fix on the lines we touched.

Basically, this patch add (or remove) whitespaces and blank lines
where needed.

No functional changes.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

+55 -37
+6 -3
drivers/media/pci/saa7134/saa7134-alsa.c
··· 161 161 } 162 162 163 163 if (dev->dmasound.read_count >= dev->dmasound.blksize * (dev->dmasound.blocks-2)) { 164 - pr_debug("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count, 164 + pr_debug("irq: overrun [full=%d/%d] - Blocks in %d\n", 165 + dev->dmasound.read_count, 165 166 dev->dmasound.bufsize, dev->dmasound.blocks); 166 167 spin_unlock(&dev->slock); 167 168 snd_pcm_stop_xrun(dev->dmasound.substream); ··· 174 173 saa_writel(reg,next_blk * dev->dmasound.blksize); 175 174 pr_debug("irq: ok, %s, next_blk=%d, addr=%x, blocks=%u, size=%u, read=%u\n", 176 175 (status & 0x10000000) ? "even" : "odd ", next_blk, 177 - next_blk * dev->dmasound.blksize, dev->dmasound.blocks, dev->dmasound.blksize, dev->dmasound.read_count); 176 + next_blk * dev->dmasound.blksize, dev->dmasound.blocks, 177 + dev->dmasound.blksize, dev->dmasound.read_count); 178 178 179 179 /* update status & wake waiting readers */ 180 180 dev->dmasound.dma_blk = (dev->dmasound.dma_blk + 1) % dev->dmasound.blocks; ··· 1188 1186 sprintf(card->longname, "%s at 0x%lx irq %d", 1189 1187 chip->dev->name, chip->iobase, chip->irq); 1190 1188 1191 - pr_info("%s/alsa: %s registered as card %d\n",dev->name,card->longname,index[devnum]); 1189 + pr_info("%s/alsa: %s registered as card %d\n", 1190 + dev->name, card->longname, index[devnum]); 1192 1191 1193 1192 if ((err = snd_card_register(card)) == 0) { 1194 1193 snd_saa7134_cards[devnum] = card;
+6 -4
drivers/media/pci/saa7134/saa7134-cards.c
··· 7516 7516 pr_warn("%s: seems there are two different versions of the MD5044\n" 7517 7517 "%s: (with the same ID) out there. If sound doesn't work for\n" 7518 7518 "%s: you try the audio_clock_override=0x200000 insmod option.\n", 7519 - dev->name,dev->name,dev->name); 7519 + dev->name, dev->name, dev->name); 7520 7520 break; 7521 7521 case SAA7134_BOARD_CINERGY400_CARDBUS: 7522 7522 /* power-up tuner chip */ ··· 7644 7644 pr_warn("%s: %s: dual saa713x broadcast decoders\n" 7645 7645 "%s: Sorry, none of the inputs to this chip are supported yet.\n" 7646 7646 "%s: Dual decoder functionality is disabled for now, use the other chip.\n", 7647 - dev->name,card(dev).name,dev->name,dev->name); 7647 + dev->name, card(dev).name, dev->name, dev->name); 7648 7648 break; 7649 7649 case SAA7134_BOARD_AVERMEDIA_M102: 7650 7650 /* enable tuner */ ··· 7826 7826 dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; 7827 7827 break; 7828 7828 default: 7829 - pr_err("%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t); 7829 + pr_err("%s Can't determine tuner type %x from EEPROM\n", 7830 + dev->name, tuner_t); 7830 7831 } 7831 7832 } else if ((data[1] != 0) && (data[1] != 0xff)) { 7832 7833 /* new config structure */ ··· 7848 7847 dev->name); 7849 7848 break; 7850 7849 default: 7851 - pr_err("%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t); 7850 + pr_err("%s Can't determine tuner type %x from EEPROM\n", 7851 + dev->name, tuner_t); 7852 7852 } 7853 7853 } else { 7854 7854 pr_err("%s unexpected config structure\n", dev->name);
+7 -6
drivers/media/pci/saa7134/saa7134-core.c
··· 134 134 index = 1 << bit_no; 135 135 switch (value) { 136 136 case 0: /* static value */ 137 - case 1: core_dbg("setting GPIO%d to static %d\n", bit_no, value); 137 + case 1: 138 + core_dbg("setting GPIO%d to static %d\n", bit_no, value); 138 139 /* turn sync mode off if necessary */ 139 140 if (index & 0x00c00000) 140 141 saa_andorb(SAA7134_VIDEO_PORT_CTRL6, 0x0f, 0x00); ··· 504 503 unsigned int i; 505 504 506 505 irq_dbg(1, "[%d,%ld]: r=0x%lx s=0x%02lx", 507 - loop, jiffies, report,status); 506 + loop, jiffies, report, status); 508 507 for (i = 0; i < IRQBITS; i++) { 509 508 if (!(report & (1 << i))) 510 509 continue; 511 - pr_cont(" %s",irqbits[i]); 510 + pr_cont(" %s", irqbits[i]); 512 511 } 513 512 if (report & SAA7134_IRQ_REPORT_DONE_RA0) { 514 513 pr_cont(" | RA0=%s,%s,%s,%ld", ··· 544 543 } 545 544 546 545 if (0 == report) { 547 - irq_dbg(2,"no (more) work\n"); 546 + irq_dbg(2, "no (more) work\n"); 548 547 goto out; 549 548 } 550 549 ··· 910 909 if (pci_pci_problems & PCIPCI_VIAETBF) 911 910 pr_info("%s: quirk: PCIPCI_VIAETBF\n", dev->name); 912 911 if (pci_pci_problems & PCIPCI_VSFX) 913 - pr_info("%s: quirk: PCIPCI_VSFX\n",dev->name); 912 + pr_info("%s: quirk: PCIPCI_VSFX\n", dev->name); 914 913 #ifdef PCIPCI_ALIMAGIK 915 914 if (pci_pci_problems & PCIPCI_ALIMAGIK) { 916 915 pr_info("%s: quirk: PCIPCI_ALIMAGIK -- latency fixup\n", ··· 1210 1209 if (!buf) 1211 1210 return 0; 1212 1211 1213 - core_dbg("buffer_requeue : resending active buffers \n"); 1212 + core_dbg("buffer_requeue : resending active buffer\n"); 1214 1213 1215 1214 if (!list_empty(&q->queue)) 1216 1215 next = list_entry(q->queue.next, struct saa7134_buf,
+18 -9
drivers/media/pci/saa7134/saa7134-dvb.c
··· 558 558 struct tda1004x_state *state = fe->demodulator_priv; 559 559 560 560 switch (state->config->antenna_switch) { 561 - case 0: break; 562 - case 1: pr_debug("setting GPIO21 to 0 (TV antenna?)\n"); 561 + case 0: 562 + break; 563 + case 1: 564 + pr_debug("setting GPIO21 to 0 (TV antenna?)\n"); 563 565 saa7134_set_gpio(dev, 21, 0); 564 566 break; 565 - case 2: pr_debug("setting GPIO21 to 1 (Radio antenna?)\n"); 567 + case 2: 568 + pr_debug("setting GPIO21 to 1 (Radio antenna?)\n"); 566 569 saa7134_set_gpio(dev, 21, 1); 567 570 break; 568 571 } ··· 578 575 struct tda1004x_state *state = fe->demodulator_priv; 579 576 580 577 switch (state->config->antenna_switch) { 581 - case 0: break; 582 - case 1: pr_debug("setting GPIO21 to 1 (Radio antenna?)\n"); 578 + case 0: 579 + break; 580 + case 1: 581 + pr_debug("setting GPIO21 to 1 (Radio antenna?)\n"); 583 582 saa7134_set_gpio(dev, 21, 1); 584 583 break; 585 - case 2: pr_debug("setting GPIO21 to 0 (TV antenna?)\n"); 584 + case 2: 585 + pr_debug("setting GPIO21 to 0 (TV antenna?)\n"); 586 586 saa7134_set_gpio(dev, 21, 0); 587 587 break; 588 588 } ··· 1035 1029 1036 1030 static int md8800_set_high_voltage2(struct dvb_frontend *fe, long arg) 1037 1031 { 1038 - pr_warn("%s: sorry can't set high LNB supply voltage from here\n", __func__); 1032 + pr_warn("%s: sorry can't set high LNB supply voltage from here\n", 1033 + __func__); 1039 1034 return -EIO; 1040 1035 } 1041 1036 ··· 1395 1388 if (fe0->dvb.frontend) { 1396 1389 if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x63, 1397 1390 &dev->i2c_adap, 0) == NULL) { 1398 - pr_warn("%s: Lifeview Trio, No tda826x found!\n", __func__); 1391 + pr_warn("%s: Lifeview Trio, No tda826x found!\n", 1392 + __func__); 1399 1393 goto detach_frontend; 1400 1394 } 1401 1395 if (dvb_attach(isl6421_attach, fe0->dvb.frontend, 1402 1396 &dev->i2c_adap, 1403 1397 0x08, 0, 0, false) == NULL) { 1404 - pr_warn("%s: Lifeview Trio, No ISL6421 found!\n", __func__); 1398 + pr_warn("%s: Lifeview Trio, No ISL6421 found!\n", 1399 + __func__); 1405 1400 goto detach_frontend; 1406 1401 } 1407 1402 }
+2 -2
drivers/media/pci/saa7134/saa7134-empress.c
··· 256 256 struct vb2_queue *q; 257 257 int err; 258 258 259 - pr_debug("%s: %s\n",dev->name,__func__); 259 + pr_debug("%s: %s\n", dev->name, __func__); 260 260 dev->empress_dev = video_device_alloc(); 261 261 if (NULL == dev->empress_dev) 262 262 return -ENOMEM; ··· 318 318 319 319 static int empress_fini(struct saa7134_dev *dev) 320 320 { 321 - pr_debug("%s: %s\n",dev->name,__func__); 321 + pr_debug("%s: %s\n", dev->name, __func__); 322 322 323 323 if (NULL == dev->empress_dev) 324 324 return 0;
+3 -2
drivers/media/pci/saa7134/saa7134-i2c.c
··· 267 267 * needed to talk to the mt352 demux 268 268 * thanks to pinnacle for the hint */ 269 269 int quirk = 0xfe; 270 - i2c_cont(1, " [%02x quirk]",quirk); 270 + i2c_cont(1, " [%02x quirk]", quirk); 271 271 i2c_send_byte(dev,START,quirk); 272 272 i2c_recv_byte(dev); 273 273 } ··· 374 374 return -1; 375 375 } 376 376 377 - for (i = 0; i < len; i+= 16) { 377 + for (i = 0; i < len; i += 16) { 378 378 int size = (len - i) > 16 ? 16 : len - i; 379 + 379 380 pr_info("i2c eeprom %02x: %*ph\n", i, size, &eedata[i]); 380 381 } 381 382
+3 -3
drivers/media/pci/saa7134/saa7134-ts.c
··· 46 46 struct saa7134_buf *next) 47 47 { 48 48 49 - ts_dbg("buffer_activate [%p]",buf); 49 + ts_dbg("buffer_activate [%p]", buf); 50 50 buf->top_seen = 0; 51 51 52 52 if (!dev->ts_started) ··· 55 55 if (NULL == next) 56 56 next = buf; 57 57 if (V4L2_FIELD_TOP == dev->ts_field) { 58 - ts_dbg("- [top] buf=%p next=%p\n",buf,next); 58 + ts_dbg("- [top] buf=%p next=%p\n", buf, next); 59 59 saa_writel(SAA7134_RS_BA1(5),saa7134_buffer_base(buf)); 60 60 saa_writel(SAA7134_RS_BA2(5),saa7134_buffer_base(next)); 61 61 dev->ts_field = V4L2_FIELD_BOTTOM; 62 62 } else { 63 - ts_dbg("- [bottom] buf=%p next=%p\n",buf,next); 63 + ts_dbg("- [bottom] buf=%p next=%p\n", buf, next); 64 64 saa_writel(SAA7134_RS_BA1(5),saa7134_buffer_base(next)); 65 65 saa_writel(SAA7134_RS_BA2(5),saa7134_buffer_base(buf)); 66 66 dev->ts_field = V4L2_FIELD_TOP;
+4 -3
drivers/media/pci/saa7134/saa7134-tvaudio.c
··· 347 347 return -1; 348 348 value = saa_readl(SAA7134_LEVEL_READOUT1 >> 2); 349 349 if (0 == i) 350 - pr_cont(" # %6d # ",value >> 16); 350 + pr_cont(" # %6d # ", value >> 16); 351 351 else 352 - pr_cont(" %6d",value >> 16); 352 + pr_cont(" %6d", value >> 16); 353 353 } 354 354 pr_cont("\n"); 355 355 } ··· 404 404 audio_dbg(1, "getstereo: nicam=0x%x\n", nicam); 405 405 if (nicam & 0x1) { 406 406 nicam_status = saa_readb(SAA7134_NICAM_STATUS); 407 - audio_dbg(1, "getstereo: nicam_status=0x%x\n", nicam_status); 407 + audio_dbg(1, "getstereo: nicam_status=0x%x\n", 408 + nicam_status); 408 409 409 410 switch (nicam_status & 0x03) { 410 411 case 0x01:
+6 -5
drivers/media/pci/saa7134/saa7134-video.c
··· 387 387 388 388 static void set_tvnorm(struct saa7134_dev *dev, struct saa7134_tvnorm *norm) 389 389 { 390 - video_dbg("set tv norm = %s\n",norm->name); 390 + video_dbg("set tv norm = %s\n", norm->name); 391 391 dev->tvnorm = norm; 392 392 393 393 /* setup cropping */ ··· 533 533 mirror = (dev->ctl_mirror) ? 0x02 : 0x00; 534 534 if (yscale < 2048) { 535 535 /* LPI */ 536 - video_dbg("yscale LPI yscale=%d\n",yscale); 536 + video_dbg("yscale LPI yscale=%d\n", yscale); 537 537 saa_writeb(SAA7134_V_FILTER(task), 0x00 | mirror); 538 538 saa_writeb(SAA7134_LUMA_CONTRAST(task), 0x40); 539 539 saa_writeb(SAA7134_CHROMA_SATURATION(task), 0x40); 540 540 } else { 541 541 /* ACM */ 542 542 val = 0x40 * 1024 / yscale; 543 - video_dbg("yscale ACM yscale=%d val=0x%x\n",yscale,val); 543 + video_dbg("yscale ACM yscale=%d val=0x%x\n", yscale, val); 544 544 saa_writeb(SAA7134_V_FILTER(task), 0x01 | mirror); 545 545 saa_writeb(SAA7134_LUMA_CONTRAST(task), val); 546 546 saa_writeb(SAA7134_CHROMA_SATURATION(task), val); ··· 575 575 prescale = 1; 576 576 xscale = 1024 * dev->crop_current.width / prescale / width; 577 577 yscale = 512 * div * dev->crop_current.height / height; 578 - video_dbg("prescale=%d xscale=%d yscale=%d\n",prescale,xscale,yscale); 578 + video_dbg("prescale=%d xscale=%d yscale=%d\n", 579 + prescale, xscale, yscale); 579 580 set_h_prescale(dev,task,prescale); 580 581 saa_writeb(SAA7134_H_SCALE_INC1(task), xscale & 0xff); 581 582 saa_writeb(SAA7134_H_SCALE_INC2(task), xscale >> 8); ··· 795 794 unsigned long base,control,bpl; 796 795 unsigned long bpl_uv,lines_uv,base2,base3,tmp; /* planar */ 797 796 798 - video_dbg("buffer_activate buf=%p\n",buf); 797 + video_dbg("buffer_activate buf=%p\n", buf); 799 798 buf->top_seen = 0; 800 799 801 800 set_size(dev, TASK_A, dev->width, dev->height,