Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e2752db0520541d6c62401eb4acfc738c5d0b9db

Authored by Nobuhiro Iwamatsu
1 parent 62cbddc493
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

net: sh-eth: Fix coding style 

This fixes checkpatch's warning.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Showing 2 changed files with 22 additions and 22 deletions Side-by-side Diff

drivers/net/sh_eth.c
Diff comments   View file @ e2752db
... ... @@ -67,7 +67,8 @@
67 67  
68 68 /* packet must be a 4 byte boundary */
69 69 if ((int)packet & 3) {
70   - printf(SHETHER_NAME ": %s: packet not 4 byte alligned\n", __func__);
  70 + printf(SHETHER_NAME ": %s: packet not 4 byte alligned\n"
  71 + , __func__);
71 72 ret = -EFAULT;
72 73 goto err;
73 74 }
... ... @@ -156,7 +157,7 @@
156 157  
157 158 /* Perform a software reset and wait for it to complete */
158 159 sh_eth_write(eth, EDMR_SRST, EDMR);
159   - for (i = 0; i < TIMEOUT_CNT ; i++) {
  160 + for (i = 0; i < TIMEOUT_CNT; i++) {
160 161 if (!(sh_eth_read(eth, EDMR) & EDMR_SRST))
161 162 break;
162 163 udelay(1000);
163 164  
164 165  
165 166  
166 167  
167 168  
168 169  
... ... @@ -523,41 +524,41 @@
523 524  
524 525 int sh_eth_initialize(bd_t *bd)
525 526 {
526   - int ret = 0;
  527 + int ret = 0;
527 528 struct sh_eth_dev *eth = NULL;
528   - struct eth_device *dev = NULL;
  529 + struct eth_device *dev = NULL;
529 530  
530   - eth = (struct sh_eth_dev *)malloc(sizeof(struct sh_eth_dev));
  531 + eth = (struct sh_eth_dev *)malloc(sizeof(struct sh_eth_dev));
531 532 if (!eth) {
532 533 printf(SHETHER_NAME ": %s: malloc failed\n", __func__);
533 534 ret = -ENOMEM;
534 535 goto err;
535 536 }
536 537  
537   - dev = (struct eth_device *)malloc(sizeof(struct eth_device));
  538 + dev = (struct eth_device *)malloc(sizeof(struct eth_device));
538 539 if (!dev) {
539 540 printf(SHETHER_NAME ": %s: malloc failed\n", __func__);
540 541 ret = -ENOMEM;
541 542 goto err;
542 543 }
543   - memset(dev, 0, sizeof(struct eth_device));
544   - memset(eth, 0, sizeof(struct sh_eth_dev));
  544 + memset(dev, 0, sizeof(struct eth_device));
  545 + memset(eth, 0, sizeof(struct sh_eth_dev));
545 546  
546 547 eth->port = CONFIG_SH_ETHER_USE_PORT;
547 548 eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR;
548 549  
549   - dev->priv = (void *)eth;
550   - dev->iobase = 0;
551   - dev->init = sh_eth_init;
552   - dev->halt = sh_eth_halt;
553   - dev->send = sh_eth_send;
554   - dev->recv = sh_eth_recv;
555   - eth->port_info[eth->port].dev = dev;
  550 + dev->priv = (void *)eth;
  551 + dev->iobase = 0;
  552 + dev->init = sh_eth_init;
  553 + dev->halt = sh_eth_halt;
  554 + dev->send = sh_eth_send;
  555 + dev->recv = sh_eth_recv;
  556 + eth->port_info[eth->port].dev = dev;
556 557  
557 558 sprintf(dev->name, SHETHER_NAME);
558 559  
559   - /* Register Device to EtherNet subsystem */
560   - eth_register(dev);
  560 + /* Register Device to EtherNet subsystem */
  561 + eth_register(dev);
561 562  
562 563 bb_miiphy_buses[0].priv = eth;
563 564 miiphy_register(dev->name, bb_miiphy_read, bb_miiphy_write);
drivers/net/sh_eth.h
Diff comments   View file @ e2752db
... ... @@ -452,7 +452,6 @@
452 452  
453 453 /* EESR */
454 454 enum EESR_BIT {
455   -
456 455 #if defined(SH_ETH_TYPE_ETHER)
457 456 EESR_TWB = 0x40000000,
458 457 #else
... ... @@ -560,8 +559,8 @@
560 559 /* ECMR */
561 560 enum FELIC_MODE_BIT {
562 561 #if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ)
563   - ECMR_TRCCM=0x04000000, ECMR_RCSC= 0x00800000, ECMR_DPAD= 0x00200000,
564   - ECMR_RZPF = 0x00100000,
  562 + ECMR_TRCCM = 0x04000000, ECMR_RCSC = 0x00800000,
  563 + ECMR_DPAD = 0x00200000, ECMR_RZPF = 0x00100000,
565 564 #endif
566 565 ECMR_ZPF = 0x00080000, ECMR_PFR = 0x00040000, ECMR_RXF = 0x00020000,
567 566 ECMR_TXF = 0x00010000, ECMR_MCT = 0x00002000, ECMR_PRCEF = 0x00001000,
... ... @@ -577,8 +576,8 @@
577 576 };
578 577  
579 578 #if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ)
580   -#define ECMR_CHG_DM (ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF | ECMR_PFR | ECMR_RXF | \
581   - ECMR_TXF | ECMR_MCT)
  579 +#define ECMR_CHG_DM (ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF | ECMR_PFR | \
  580 + ECMR_RXF | ECMR_TXF | ECMR_MCT)
582 581 #elif defined(SH_ETH_TYPE_ETHER)
583 582 #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF)
584 583 #else