Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ecc8edbf6995558d8a47b43ac6645840c98a7b95

Authored by Mike Dunn
Committed by Marek Vasut
1 parent 81c065d2a0
Exists in master and in 53 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.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, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, 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, v2017.01-smarct4x

usb: pxa27x_udc: fix compiler warnings 

Newer gcc versions warn about unused variables.  This patch corrects a few of
those warnings that popped up in a build for the palmtreo680 board.

Signed-off-by: Mike Dunn <mikedunn@newsguy.com>

Showing 1 changed file with 5 additions and 9 deletions Side-by-side Diff

drivers/usb/gadget/pxa27x_udc.c
Diff comments   View file @ ecc8edb
... ... @@ -151,7 +151,7 @@
151 151 struct urb *urb = endpoint->rcv_urb;
152 152 int ep_num = endpoint->endpoint_address & USB_ENDPOINT_NUMBER_MASK;
153 153 u32 *data32 = (u32 *) urb->buffer;
154   - unsigned int i, n, is_short ;
  154 + unsigned int i, n;
155 155  
156 156 usbdbg("read urb on ep %d", ep_num);
157 157 #if defined(USBDDBG) && defined(USBDPARANOIA)
158 158  
... ... @@ -165,9 +165,8 @@
165 165 n = readl(UDCBCN(ep_num)) & 0x3ff;
166 166 else /* zlp */
167 167 n = 0;
168   - is_short = n != endpoint->rcv_packetSize;
169 168  
170   - usbdbg("n %d%s", n, is_short ? "-s" : "");
  169 + usbdbg("n %d%s", n, n != endpoint->rcv_packetSize ? "-s" : "");
171 170 for (i = 0; i < n; i += 4)
172 171 data32[urb->actual_length / 4 + i / 4] = readl(UDCDN(ep_num));
173 172  
174 173  
175 174  
... ... @@ -402,16 +401,13 @@
402 401  
403 402 static void udc_state_changed(void)
404 403 {
405   - int config, interface, alternate;
406 404  
407 405 writel(readl(UDCCR) | UDCCR_SMAC, UDCCR);
408 406  
409   - config = (readl(UDCCR) & UDCCR_ACN) >> UDCCR_ACN_S;
410   - interface = (readl(UDCCR) & UDCCR_AIN) >> UDCCR_AIN_S;
411   - alternate = (readl(UDCCR) & UDCCR_AAISN) >> UDCCR_AAISN_S;
412   -
413 407 usbdbg("New UDC settings are: conf %d - inter %d - alter %d",
414   - config, interface, alternate);
  408 + (readl(UDCCR) & UDCCR_ACN) >> UDCCR_ACN_S,
  409 + (readl(UDCCR) & UDCCR_AIN) >> UDCCR_AIN_S,
  410 + (readl(UDCCR) & UDCCR_AAISN) >> UDCCR_AAISN_S);
415 411  
416 412 usbd_device_event_irq(udc_device, DEVICE_CONFIGURED, 0);
417 413 writel(UDCISR1_IRCC, UDCISR1);