API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Dec 5th, 2015
87
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 30.75 KB | None | 0 0
raw download clone embed print report
  1. From 870523db97a3c91f22272d089559ce1cfa4f2d66 Mon Sep 17 00:00:00 2001
  2. From: "Geyslan G. Bem" <geyslan@gmail.com>
  3. Date: Fri, 4 Dec 2015 21:01:47 -0300
  4. Subject: [PATCH] usb: host: move constants to right
  5.  
  6. Move constants to rightmost.
  7.  
  8. Some lines affected by the rule were adjusted to the
  9. coding style.
  10.  
  11. Coccinelle: scripts/coccinelle/misc/compare_const_fl.cocci
  12.  
  13. Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
  14. ---
  15. drivers/usb/host/ehci-dbg.c | 8 ++--
  16. drivers/usb/host/ehci-q.c | 4 +-
  17. drivers/usb/host/ehci-sched.c | 6 +--
  18. drivers/usb/host/ehci.h | 2 +-
  19. drivers/usb/host/fotg210.h | 10 +++--
  20. drivers/usb/host/isp116x-hcd.c | 8 ++--
  21. drivers/usb/host/isp1362-hcd.c | 2 +-
  22. drivers/usb/host/isp1362.h | 2 +-
  23. drivers/usb/host/max3421-hcd.c | 14 +++----
  24. drivers/usb/host/ohci-dbg.c | 18 ++++-----
  25. drivers/usb/host/ohci-hcd.c | 6 +--
  26. drivers/usb/host/ohci.h | 2 +-
  27. drivers/usb/host/oxu210hp-hcd.c | 5 +--
  28. drivers/usb/host/sl811-hcd.c | 4 +-
  29. drivers/usb/host/u132-hcd.c | 88 ++++++++++++++++++++---------------------
  30. drivers/usb/host/uhci-debug.c | 2 +-
  31. drivers/usb/host/uhci-q.c | 4 +-
  32. drivers/usb/host/whci/qset.c | 2 +-
  33. drivers/usb/host/whci/whci-hc.h | 2 +-
  34. drivers/usb/host/whci/wusb.c | 4 +-
  35. drivers/usb/host/xhci-hub.c | 2 +-
  36. drivers/usb/host/xhci-mem.c | 2 +-
  37. drivers/usb/host/xhci-ring.c | 4 +-
  38. 23 files changed, 100 insertions(+), 101 deletions(-)
  39.  
  40. diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
  41. index b26b96e..fc80c4d 100644
  42. --- a/drivers/usb/host/ehci-dbg.c
  43. +++ b/drivers/usb/host/ehci-dbg.c
  44. @@ -696,9 +696,9 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
  45. &p.qh->qtd_list,
  46. qtd_list) {
  47. temp++;
  48. - switch (0x03 & (hc32_to_cpu(
  49. - ehci,
  50. - qtd->hw_token) >> 8)) {
  51. + switch ((hc32_to_cpu(ehci,
  52. + qtd->hw_token) >> 8)
  53. + & 0x03) {
  54. case 0: type = "out"; continue;
  55. case 1: type = "in"; continue;
  56. }
  57. @@ -713,7 +713,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
  58. p.qh->ps.usecs,
  59. p.qh->ps.c_usecs,
  60. temp,
  61. - 0x7ff & (scratch >> 16));
  62. + (scratch >> 16) & 0x7ff);
  63.  
  64. if (seen_count < DBG_SCHED_LIMIT)
  65. seen [seen_count++].qh = p.qh;
  66. diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
  67. index 54f5332..f11f8d8 100644
  68. --- a/drivers/usb/host/ehci-q.c
  69. +++ b/drivers/usb/host/ehci-q.c
  70. @@ -380,8 +380,8 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
  71. * where we left off
  72. */
  73. token &= ~QTD_STS_HALT;
  74. - token |= QTD_STS_ACTIVE |
  75. - (EHCI_TUNE_CERR << 10);
  76. + token |= (EHCI_TUNE_CERR << 10) |
  77. + QTD_STS_ACTIVE;
  78. qtd->hw_token = cpu_to_hc32(ehci,
  79. token);
  80. wmb();
  81. diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
  82. index f9a3327..8dc1eb2 100644
  83. --- a/drivers/usb/host/ehci-sched.c
  84. +++ b/drivers/usb/host/ehci-sched.c
  85. @@ -330,7 +330,7 @@ static int __maybe_unused same_tt(struct usb_device *dev1,
  86. */
  87. static inline unsigned char tt_start_uframe(struct ehci_hcd *ehci, __hc32 mask)
  88. {
  89. - unsigned char smask = QH_SMASK & hc32_to_cpu(ehci, mask);
  90. + unsigned char smask = hc32_to_cpu(ehci, mask) & QH_SMASK;
  91. if (!smask) {
  92. ehci_err(ehci, "invalid empty smask!\n");
  93. /* uframe 7 can't have bw so this will indicate failure */
  94. @@ -409,11 +409,11 @@ static int tt_available (
  95. * must be empty, so as to not illegally delay
  96. * already scheduled transactions
  97. */
  98. - if (125 < usecs) {
  99. + if (usecs > 125) {
  100. int ufs = (usecs / 125);
  101.  
  102. for (i = uframe; i < (uframe + ufs) && i < 8; i++)
  103. - if (0 < tt_usecs[i])
  104. + if (tt_usecs[i] > 0)
  105. return 0;
  106. }
  107.  
  108. diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
  109. index 46f62e4..f455975 100644
  110. --- a/drivers/usb/host/ehci.h
  111. +++ b/drivers/usb/host/ehci.h
  112. @@ -553,7 +553,7 @@ struct ehci_sitd {
  113. __hc32 hw_results; /* EHCI table 3-11 */
  114. #define SITD_IOC (1 << 31) /* interrupt on completion */
  115. #define SITD_PAGE (1 << 30) /* buffer 0/1 */
  116. -#define SITD_LENGTH(x) (0x3ff & ((x)>>16))
  117. +#define SITD_LENGTH(x) (((x) >> 16) & 0x3ff)
  118. #define SITD_STS_ACTIVE (1 << 7) /* HC may execute this */
  119. #define SITD_STS_ERR (1 << 6) /* error from TT */
  120. #define SITD_STS_DBE (1 << 5) /* data buffer error (in HC) */
  121. diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h
  122. index b5cfa7a..010c9c5 100644
  123. --- a/drivers/usb/host/fotg210.h
  124. +++ b/drivers/usb/host/fotg210.h
  125. @@ -208,10 +208,12 @@ struct fotg210_caps {
  126. * affects the memory map for big endian controllers.
  127. */
  128. u32 hc_capbase;
  129. -#define HC_LENGTH(fotg210, p) (0x00ff&((p) >> /* bits 7:0 / offset 00h */ \
  130. - (fotg210_big_endian_capbase(fotg210) ? 24 : 0)))
  131. -#define HC_VERSION(fotg210, p) (0xffff&((p) >> /* bits 31:16 / offset 02h */ \
  132. - (fotg210_big_endian_capbase(fotg210) ? 0 : 16)))
  133. +#define HC_LENGTH(fotg210, p) (((p) >> /* bits 7:0 / offset 00h */ \
  134. + (fotg210_big_endian_capbase(fotg210) ? 24 : 0)) & \
  135. + 0x00ff)
  136. +#define HC_VERSION(fotg210, p) (((p) >> /* bits 31:16 / offset 02h */ \
  137. + (fotg210_big_endian_capbase(fotg210) ? 0 : 16)) & \
  138. + 0xffff)
  139. u32 hcs_params; /* HCSPARAMS - offset 0x4 */
  140. #define HCS_N_PORTS(p) (((p)>>0)&0xf) /* bits 3:0, ports on HC */
  141.  
  142. diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
  143. index d089b3f..dae2f37 100644
  144. --- a/drivers/usb/host/isp116x-hcd.c
  145. +++ b/drivers/usb/host/isp116x-hcd.c
  146. @@ -114,7 +114,7 @@ static void write_ptddata_to_fifo(struct isp116x *isp116x, void *buf, int len)
  147. }
  148.  
  149. if (len)
  150. - isp116x_write_data16(isp116x, 0xff & *((u8 *) dp2));
  151. + isp116x_write_data16(isp116x, *((u8 *) dp2) & 0xff);
  152. }
  153. if (quot == 1 || quot == 2)
  154. isp116x_raw_write_data16(isp116x, 0);
  155. @@ -143,7 +143,7 @@ static void read_ptddata_from_fifo(struct isp116x *isp116x, void *buf, int len)
  156. }
  157.  
  158. if (len)
  159. - *dp = 0xff & isp116x_read_data16(isp116x);
  160. + *dp = isp116x_read_data16(isp116x) & 0xff;
  161. } else {
  162. /* aligned */
  163. for (; len > 1; len -= 2) {
  164. @@ -152,7 +152,7 @@ static void read_ptddata_from_fifo(struct isp116x *isp116x, void *buf, int len)
  165. }
  166.  
  167. if (len)
  168. - *(u8 *) dp2 = 0xff & isp116x_read_data16(isp116x);
  169. + *(u8 *) dp2 = isp116x_read_data16(isp116x) & 0xff;
  170. }
  171. if (quot == 1 || quot == 2)
  172. isp116x_raw_read_data16(isp116x);
  173. @@ -1337,7 +1337,7 @@ static int isp116x_start(struct usb_hcd *hcd)
  174. isp116x_write_reg16(isp116x, HCATLBUFLEN, ISP116x_ATL_BUFSIZE);
  175.  
  176. /* ----- HW conf */
  177. - val = HCHWCFG_INT_ENABLE | HCHWCFG_DBWIDTH(1);
  178. + val = HCHWCFG_DBWIDTH(1) | HCHWCFG_INT_ENABLE;
  179. if (board->sel15Kres)
  180. val |= HCHWCFG_15KRSEL;
  181. /* Remote wakeup won't work without working clock */
  182. diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
  183. index 6cf82ee..ddbaec3 100644
  184. --- a/drivers/usb/host/isp1362-hcd.c
  185. +++ b/drivers/usb/host/isp1362-hcd.c
  186. @@ -2515,7 +2515,7 @@ static int isp1362_hc_start(struct usb_hcd *hcd)
  187. isp1362_write_reg16(isp1362_hcd, HCuPINTENB, 0);
  188.  
  189. /* HW conf */
  190. - hwcfg = HCHWCFG_INT_ENABLE | HCHWCFG_DBWIDTH(1);
  191. + hwcfg = HCHWCFG_DBWIDTH(1) | HCHWCFG_INT_ENABLE;
  192. if (board->sel15Kres)
  193. hwcfg |= HCHWCFG_PULLDOWN_DS2 |
  194. ((MAX_ROOT_PORTS > 1) ? HCHWCFG_PULLDOWN_DS1 : 0);
  195. diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
  196. index 3b0b484..036cc02 100644
  197. --- a/drivers/usb/host/isp1362.h
  198. +++ b/drivers/usb/host/isp1362.h
  199. @@ -384,7 +384,7 @@ static const int cc_to_error[16] = {
  200. #define RH_A_POTPGT (0xff << 24) /* power on to power good time */
  201.  
  202. #define FI 0x2edf /* 12000 bits per frame (-1) */
  203. -#define FSMP(fi) (0x7fff & ((6 * ((fi) - 210)) / 7))
  204. +#define FSMP(fi) (((6 * ((fi) - 210)) / 7) & 0x7fff)
  205. #define LSTHRESH 0x628 /* lowspeed bit threshold */
  206.  
  207. /* ------------------------------------------------------------------------- */
  208. diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
  209. index bd98706..70172a6 100644
  210. --- a/drivers/usb/host/max3421-hcd.c
  211. +++ b/drivers/usb/host/max3421-hcd.c
  212. @@ -317,13 +317,13 @@ static const int hrsl_to_error[] = {
  213. * reasonable overview of how control transfers use the the IN/OUT
  214. * tokens.
  215. */
  216. -#define MAX3421_HXFR_BULK_IN(ep) (0x00 | (ep)) /* bulk or interrupt */
  217. -#define MAX3421_HXFR_SETUP 0x10
  218. -#define MAX3421_HXFR_BULK_OUT(ep) (0x20 | (ep)) /* bulk or interrupt */
  219. -#define MAX3421_HXFR_ISO_IN(ep) (0x40 | (ep))
  220. -#define MAX3421_HXFR_ISO_OUT(ep) (0x60 | (ep))
  221. -#define MAX3421_HXFR_HS_IN 0x80 /* handshake in */
  222. -#define MAX3421_HXFR_HS_OUT 0xa0 /* handshake out */
  223. +#define MAX3421_HXFR_BULK_IN(ep) ((ep) | 0x00) /* bulk or interrupt */
  224. +#define MAX3421_HXFR_SETUP 0x10
  225. +#define MAX3421_HXFR_BULK_OUT(ep) ((ep) | 0x20) /* bulk or interrupt */
  226. +#define MAX3421_HXFR_ISO_IN(ep) ((ep) | 0x40)
  227. +#define MAX3421_HXFR_ISO_OUT(ep) ((ep) | 0x60)
  228. +#define MAX3421_HXFR_HS_IN 0x80 /* handshake in */
  229. +#define MAX3421_HXFR_HS_OUT 0xa0 /* handshake out */
  230.  
  231. #define field(val, bit) ((val) << (bit))
  232.  
  233. diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
  234. index c3eded3..a14ce64 100644
  235. --- a/drivers/usb/host/ohci-dbg.c
  236. +++ b/drivers/usb/host/ohci-dbg.c
  237. @@ -104,10 +104,10 @@ ohci_dump_status (struct ohci_hcd *controller, char **next, unsigned *size)
  238.  
  239. temp = ohci_readl (controller, &regs->revision) & 0xff;
  240. ohci_dbg_sw (controller, next, size,
  241. - "OHCI %d.%d, %s legacy support registers, rh state %s\n",
  242. - 0x03 & (temp >> 4), (temp & 0x0f),
  243. - (temp & 0x0100) ? "with" : "NO",
  244. - rh_state_string(controller));
  245. + "OHCI %d.%d, %s legacy support registers, rh state %s\n",
  246. + ((temp >> 4) & 0x03), (temp & 0x0f),
  247. + (temp & 0x0100) ? "with" : "NO",
  248. + rh_state_string(controller));
  249.  
  250. temp = ohci_readl (controller, &regs->control);
  251. ohci_dbg_sw (controller, next, size,
  252. @@ -325,14 +325,14 @@ ohci_dump_ed (const struct ohci_hcd *ohci, const char *label,
  253. }
  254. ohci_dbg (ohci,
  255. " info %08x MAX=%d%s%s%s%s EP=%d%s DEV=%d\n", tmp,
  256. - 0x03ff & (tmp >> 16),
  257. + (tmp >> 16) & 0x03ff,
  258. (tmp & ED_DEQUEUE) ? " DQ" : "",
  259. (tmp & ED_ISO) ? " ISO" : "",
  260. (tmp & ED_SKIP) ? " SKIP" : "",
  261. (tmp & ED_LOWSPEED) ? " LOW" : "",
  262. - 0x000f & (tmp >> 7),
  263. + (tmp >> 7) & 0x000f,
  264. type,
  265. - 0x007f & tmp);
  266. + tmp & 0x007f);
  267. tmp = hc32_to_cpup (ohci, &ed->hwHeadP);
  268. ohci_dbg (ohci, " tds: head %08x %s%s tail %08x%s\n",
  269. tmp,
  270. @@ -421,7 +421,7 @@ show_list (struct ohci_hcd *ohci, char *buf, size_t count, struct ed *ed)
  271. info & 0x7f,
  272. (info >> 7) & 0xf,
  273. (info & ED_IN) ? "in" : "out",
  274. - 0x03ff & (info >> 16),
  275. + (info >> 16) & 0x03ff,
  276. info,
  277. (info & ED_SKIP) ? " s" : "",
  278. (headp & ED_H) ? " H" : "",
  279. @@ -544,7 +544,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
  280. (info & ED_IN) ? "in" : "out",
  281. (info & ED_ISO) ? "iso" : "int",
  282. qlen,
  283. - 0x03ff & (info >> 16),
  284. + (info >> 16) & 0x03ff,
  285. info,
  286. (info & ED_SKIP) ? " K" : "",
  287. (ed->hwHeadP &
  288. diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
  289. index 5547dbf..8d5b3e0 100644
  290. --- a/drivers/usb/host/ohci-hcd.c
  291. +++ b/drivers/usb/host/ohci-hcd.c
  292. @@ -765,9 +765,9 @@ static void io_watchdog_func(unsigned long _ohci)
  293. unsigned tmp = hc32_to_cpu(ohci, ed->hwINFO);
  294.  
  295. ohci_dbg(ohci, "takeback pending TD for dev %d ep 0x%x\n",
  296. - 0x007f & tmp,
  297. - (0x000f & (tmp >> 7)) +
  298. - ((tmp & ED_IN) >> 5));
  299. + tmp & 0x007f,
  300. + ((tmp >> 7) & 0x000f) +
  301. + ((tmp & ED_IN) >> 5));
  302. add_to_done_list(ohci, ed->pending_td);
  303. }
  304. }
  305. diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
  306. index bc46228..2af17b9 100644
  307. --- a/drivers/usb/host/ohci.h
  308. +++ b/drivers/usb/host/ohci.h
  309. @@ -686,7 +686,7 @@ static inline u16 ohci_hwPSW(const struct ohci_hcd *ohci,
  310. /*-------------------------------------------------------------------------*/
  311.  
  312. #define FI 0x2edf /* 12000 bits per frame (-1) */
  313. -#define FSMP(fi) (0x7fff & ((6 * ((fi) - 210)) / 7))
  314. +#define FSMP(fi) (((6 * ((fi) - 210)) / 7) & 0x7fff)
  315. #define FIT (1 << 31)
  316. #define LSTHRESH 0x628 /* lowspeed bit threshold */
  317.  
  318. diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
  319. index bc74aca..530b1c7 100644
  320. --- a/drivers/usb/host/oxu210hp-hcd.c
  321. +++ b/drivers/usb/host/oxu210hp-hcd.c
  322. @@ -1092,7 +1092,7 @@ static unsigned qh_completions(struct oxu_hcd *oxu, struct ehci_qh *qh)
  323. * patch the qh later and so that completions can't
  324. * activate it while we "know" it's stopped.
  325. */
  326. - if ((HALT_BIT & qh->hw_token) == 0) {
  327. + if (!(qh->hw_token & HALT_BIT)) {
  328. halt:
  329. qh->hw_token |= HALT_BIT;
  330. wmb();
  331. @@ -1103,8 +1103,7 @@ halt:
  332. qtd_copy_status(oxu, urb->complete ?
  333. urb : ((struct oxu_murb *) urb)->main,
  334. qtd->length, token);
  335. - if ((usb_pipein(qtd->urb->pipe)) &&
  336. - (NULL != qtd->transfer_buffer))
  337. + if ((usb_pipein(qtd->urb->pipe)) && (qtd->transfer_buffer))
  338. memcpy(qtd->transfer_buffer, qtd->buffer, qtd->length);
  339. do_status = (urb->status == -EREMOTEIO)
  340. && usb_pipecontrol(urb->pipe);
  341. diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
  342. index fd2a114..b7f19c7 100644
  343. --- a/drivers/usb/host/sl811-hcd.c
  344. +++ b/drivers/usb/host/sl811-hcd.c
  345. @@ -218,7 +218,7 @@ static void in_packet(
  346. /* autoincrementing */
  347. sl811_write(sl811, bank + SL11H_BUFADDRREG, addr);
  348. writeb(len, data_reg);
  349. - writeb(SL_IN | ep->epnum, data_reg);
  350. + writeb(ep->epnum | SL_IN, data_reg);
  351. writeb(usb_pipedevice(urb->pipe), data_reg);
  352.  
  353. sl811_write(sl811, bank + SL11H_HOSTCTLREG, control);
  354. @@ -261,7 +261,7 @@ static void out_packet(
  355. /* autoincrementing */
  356. sl811_write(sl811, bank + SL11H_BUFADDRREG, addr);
  357. writeb(len, data_reg);
  358. - writeb(SL_OUT | ep->epnum, data_reg);
  359. + writeb(ep->epnum | SL_OUT, data_reg);
  360. writeb(usb_pipedevice(urb->pipe), data_reg);
  361.  
  362. sl811_write(sl811, bank + SL11H_HOSTCTLREG,
  363. diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
  364. index 05c85c7..8bfec14 100644
  365. --- a/drivers/usb/host/u132-hcd.c
  366. +++ b/drivers/usb/host/u132-hcd.c
  367. @@ -518,7 +518,7 @@ static void u132_hcd_giveback_urb(struct u132 *u132, struct u132_endp *endp,
  368. spin_lock_irqsave(&endp->queue_lock.slock, irqs);
  369. usb_hcd_unlink_urb_from_ep(hcd, urb);
  370. endp->queue_next += 1;
  371. - if (ENDP_QUEUE_SIZE > --endp->queue_size) {
  372. + if (--endp->queue_size < ENDP_QUEUE_SIZE) {
  373. endp->active = 0;
  374. spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
  375. } else {
  376. @@ -526,7 +526,7 @@ static void u132_hcd_giveback_urb(struct u132 *u132, struct u132_endp *endp,
  377. struct u132_urbq *urbq = list_entry(next, struct u132_urbq,
  378. urb_more);
  379. list_del(next);
  380. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] =
  381. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] =
  382. urbq->urb;
  383. endp->active = 0;
  384. spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
  385. @@ -557,7 +557,7 @@ static void u132_hcd_abandon_urb(struct u132 *u132, struct u132_endp *endp,
  386. spin_lock_irqsave(&endp->queue_lock.slock, irqs);
  387. usb_hcd_unlink_urb_from_ep(hcd, urb);
  388. endp->queue_next += 1;
  389. - if (ENDP_QUEUE_SIZE > --endp->queue_size) {
  390. + if (--endp->queue_size < ENDP_QUEUE_SIZE) {
  391. endp->active = 0;
  392. spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
  393. } else {
  394. @@ -565,7 +565,7 @@ static void u132_hcd_abandon_urb(struct u132 *u132, struct u132_endp *endp,
  395. struct u132_urbq *urbq = list_entry(next, struct u132_urbq,
  396. urb_more);
  397. list_del(next);
  398. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] =
  399. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] =
  400. urbq->urb;
  401. endp->active = 0;
  402. spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
  403. @@ -659,7 +659,7 @@ static void u132_hcd_interrupt_recv(void *data, struct urb *urb, u8 *buf,
  404. (urb->transfer_buffer_length > urb->actual_length)) {
  405. endp->toggle_bits = toggle_bits;
  406. usb_settoggle(udev->usb_device, endp->usb_endp, 0,
  407. - 1 & toggle_bits);
  408. + toggle_bits & 1);
  409. if (urb->actual_length > 0) {
  410. int retval;
  411. mutex_unlock(&u132->scheduler_lock);
  412. @@ -684,7 +684,7 @@ static void u132_hcd_interrupt_recv(void *data, struct urb *urb, u8 *buf,
  413. ((urb->transfer_flags & URB_SHORT_NOT_OK) == 0)) {
  414. endp->toggle_bits = toggle_bits;
  415. usb_settoggle(udev->usb_device, endp->usb_endp, 0,
  416. - 1 & toggle_bits);
  417. + toggle_bits & 1);
  418. mutex_unlock(&u132->scheduler_lock);
  419. u132_hcd_giveback_urb(u132, endp, urb, 0);
  420. return;
  421. @@ -692,7 +692,7 @@ static void u132_hcd_interrupt_recv(void *data, struct urb *urb, u8 *buf,
  422. if (condition_code == TD_CC_NOERROR) {
  423. endp->toggle_bits = toggle_bits;
  424. usb_settoggle(udev->usb_device, endp->usb_endp,
  425. - 0, 1 & toggle_bits);
  426. + 0, toggle_bits & 1);
  427. } else if (condition_code == TD_CC_STALL) {
  428. endp->toggle_bits = 0x2;
  429. usb_settoggle(udev->usb_device, endp->usb_endp,
  430. @@ -811,7 +811,7 @@ static void u132_hcd_bulk_input_recv(void *data, struct urb *urb, u8 *buf,
  431. int retval;
  432. endp->toggle_bits = toggle_bits;
  433. usb_settoggle(udev->usb_device, endp->usb_endp, 0,
  434. - 1 & toggle_bits);
  435. + toggle_bits & 1);
  436. mutex_unlock(&u132->scheduler_lock);
  437. retval = usb_ftdi_elan_edset_input(u132->platform_dev,
  438. ring->number, endp, urb, address,
  439. @@ -823,7 +823,7 @@ static void u132_hcd_bulk_input_recv(void *data, struct urb *urb, u8 *buf,
  440. } else if (condition_code == TD_CC_NOERROR) {
  441. endp->toggle_bits = toggle_bits;
  442. usb_settoggle(udev->usb_device, endp->usb_endp, 0,
  443. - 1 & toggle_bits);
  444. + toggle_bits & 1);
  445. mutex_unlock(&u132->scheduler_lock);
  446. u132_hcd_giveback_urb(u132, endp, urb,
  447. cc_to_error[condition_code]);
  448. @@ -832,14 +832,14 @@ static void u132_hcd_bulk_input_recv(void *data, struct urb *urb, u8 *buf,
  449. ((urb->transfer_flags & URB_SHORT_NOT_OK) == 0)) {
  450. endp->toggle_bits = toggle_bits;
  451. usb_settoggle(udev->usb_device, endp->usb_endp, 0,
  452. - 1 & toggle_bits);
  453. + toggle_bits & 1);
  454. mutex_unlock(&u132->scheduler_lock);
  455. u132_hcd_giveback_urb(u132, endp, urb, 0);
  456. return;
  457. } else if (condition_code == TD_DATAUNDERRUN) {
  458. endp->toggle_bits = toggle_bits;
  459. usb_settoggle(udev->usb_device, endp->usb_endp, 0,
  460. - 1 & toggle_bits);
  461. + toggle_bits & 1);
  462. dev_warn(&u132->platform_dev->dev, "urb=%p(SHORT NOT OK"
  463. ") giving back BULK IN %s\n", urb,
  464. cc_to_text[condition_code]);
  465. @@ -1396,8 +1396,8 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
  466. return;
  467. } else {
  468. int retval;
  469. - struct urb *urb = endp->urb_list[ENDP_QUEUE_MASK &
  470. - endp->queue_next];
  471. + struct urb *urb = endp->urb_list[endp->queue_next &
  472. + ENDP_QUEUE_MASK];
  473. endp->active = 1;
  474. ring->curr_endp = endp;
  475. ring->in_use = 1;
  476. @@ -1416,8 +1416,8 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
  477. return;
  478. } else if (address == 0) {
  479. int retval;
  480. - struct urb *urb = endp->urb_list[ENDP_QUEUE_MASK &
  481. - endp->queue_next];
  482. + struct urb *urb = endp->urb_list[endp->queue_next &
  483. + ENDP_QUEUE_MASK];
  484. endp->active = 1;
  485. ring->curr_endp = endp;
  486. ring->in_use = 1;
  487. @@ -1429,8 +1429,8 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
  488. return;
  489. } else if (endp->usb_addr == 0) {
  490. int retval;
  491. - struct urb *urb = endp->urb_list[ENDP_QUEUE_MASK &
  492. - endp->queue_next];
  493. + struct urb *urb = endp->urb_list[endp->queue_next &
  494. + ENDP_QUEUE_MASK];
  495. endp->active = 1;
  496. ring->curr_endp = endp;
  497. ring->in_use = 1;
  498. @@ -1442,8 +1442,8 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
  499. return;
  500. } else {
  501. int retval;
  502. - struct urb *urb = endp->urb_list[ENDP_QUEUE_MASK &
  503. - endp->queue_next];
  504. + struct urb *urb = endp->urb_list[endp->queue_next &
  505. + ENDP_QUEUE_MASK];
  506. address = u132->addr[endp->usb_addr].address;
  507. endp->active = 1;
  508. ring->curr_endp = endp;
  509. @@ -1464,8 +1464,8 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
  510. return;
  511. } else {
  512. int retval;
  513. - struct urb *urb = endp->urb_list[
  514. - ENDP_QUEUE_MASK & endp->queue_next];
  515. + struct urb *urb = endp->urb_list[endp->queue_next &
  516. + ENDP_QUEUE_MASK];
  517. endp->active = 1;
  518. ring->curr_endp = endp;
  519. ring->in_use = 1;
  520. @@ -1487,8 +1487,8 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
  521. return;
  522. } else {
  523. int retval;
  524. - struct urb *urb = endp->urb_list[
  525. - ENDP_QUEUE_MASK & endp->queue_next];
  526. + struct urb *urb = endp->urb_list[endp->queue_next &
  527. + ENDP_QUEUE_MASK];
  528. endp->active = 1;
  529. ring->curr_endp = endp;
  530. ring->in_use = 1;
  531. @@ -1708,7 +1708,7 @@ extra: {
  532. retval = u132_read_pcimem(u132, periodicstart, &periodicstart);
  533. if (retval)
  534. return retval;
  535. - if (0 == (fminterval & 0x3fff0000) || 0 == periodicstart) {
  536. + if (!(fminterval & 0x3fff0000) || !periodicstart) {
  537. if (!(u132->flags & OHCI_QUIRK_INITRESET)) {
  538. u132->flags |= OHCI_QUIRK_INITRESET;
  539. goto retry;
  540. @@ -1923,7 +1923,7 @@ static int create_endpoint_and_queue_int(struct u132 *u132,
  541. endp->queue_size = 1;
  542. endp->queue_last = 0;
  543. endp->queue_next = 0;
  544. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] = urb;
  545. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] = urb;
  546. spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
  547. u132_endp_queue_work(u132, endp, msecs_to_jiffies(urb->interval));
  548. return 0;
  549. @@ -1938,7 +1938,7 @@ static int queue_int_on_old_endpoint(struct u132 *u132,
  550. endp->delayed = 1;
  551. endp->jiffies = jiffies + msecs_to_jiffies(urb->interval);
  552. if (endp->queue_size++ < ENDP_QUEUE_SIZE) {
  553. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] = urb;
  554. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] = urb;
  555. } else {
  556. struct u132_urbq *urbq = kmalloc(sizeof(struct u132_urbq),
  557. GFP_ATOMIC);
  558. @@ -2022,7 +2022,7 @@ static int create_endpoint_and_queue_bulk(struct u132 *u132,
  559. endp->queue_size = 1;
  560. endp->queue_last = 0;
  561. endp->queue_next = 0;
  562. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] = urb;
  563. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] = urb;
  564. spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
  565. u132_endp_queue_work(u132, endp, 0);
  566. return 0;
  567. @@ -2035,7 +2035,7 @@ static int queue_bulk_on_old_endpoint(struct u132 *u132, struct u132_udev *udev,
  568. {
  569. urb->hcpriv = u132;
  570. if (endp->queue_size++ < ENDP_QUEUE_SIZE) {
  571. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] = urb;
  572. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] = urb;
  573. } else {
  574. struct u132_urbq *urbq = kmalloc(sizeof(struct u132_urbq),
  575. GFP_ATOMIC);
  576. @@ -2111,7 +2111,7 @@ static int create_endpoint_and_queue_control(struct u132 *u132,
  577. endp->queue_size = 1;
  578. endp->queue_last = 0;
  579. endp->queue_next = 0;
  580. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] = urb;
  581. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] = urb;
  582. spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
  583. u132_endp_queue_work(u132, endp, 0);
  584. return 0;
  585. @@ -2132,7 +2132,7 @@ static int create_endpoint_and_queue_control(struct u132 *u132,
  586. endp->queue_size = 1;
  587. endp->queue_last = 0;
  588. endp->queue_next = 0;
  589. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] = urb;
  590. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] = urb;
  591. spin_unlock_irqrestore(&endp->queue_lock.slock, irqs);
  592. u132_endp_queue_work(u132, endp, 0);
  593. return 0;
  594. @@ -2148,8 +2148,8 @@ static int queue_control_on_old_endpoint(struct u132 *u132,
  595. if (usb_pipein(urb->pipe)) {
  596. urb->hcpriv = u132;
  597. if (endp->queue_size++ < ENDP_QUEUE_SIZE) {
  598. - endp->urb_list[ENDP_QUEUE_MASK &
  599. - endp->queue_last++] = urb;
  600. + endp->urb_list[endp->queue_last++ &
  601. + ENDP_QUEUE_MASK] = urb;
  602. } else {
  603. struct u132_urbq *urbq =
  604. kmalloc(sizeof(struct u132_urbq),
  605. @@ -2198,8 +2198,8 @@ static int queue_control_on_old_endpoint(struct u132 *u132,
  606. }
  607. urb->hcpriv = u132;
  608. if (endp->queue_size++ < ENDP_QUEUE_SIZE) {
  609. - endp->urb_list[ENDP_QUEUE_MASK &
  610. - endp->queue_last++] = urb;
  611. + endp->urb_list[endp->queue_last++ &
  612. + ENDP_QUEUE_MASK] = urb;
  613. } else {
  614. struct u132_urbq *urbq =
  615. kmalloc(sizeof(struct u132_urbq),
  616. @@ -2222,7 +2222,7 @@ static int queue_control_on_old_endpoint(struct u132 *u132,
  617. if (udev->enumeration != 2)
  618. udev->enumeration = 2;
  619. if (endp->queue_size++ < ENDP_QUEUE_SIZE) {
  620. - endp->urb_list[ENDP_QUEUE_MASK & endp->queue_last++] =
  621. + endp->urb_list[endp->queue_last++ & ENDP_QUEUE_MASK] =
  622. urb;
  623. } else {
  624. struct u132_urbq *urbq =
  625. @@ -2458,17 +2458,15 @@ static int u132_endp_urb_dequeue(struct u132 *u132, struct u132_endp *endp,
  626. while (++queue_list < ENDP_QUEUE_SIZE && --queue_size > 0) {
  627. if (urb == endp->urb_list[ENDP_QUEUE_MASK &
  628. ++queue_scan]) {
  629. - urb_slot = &endp->urb_list[ENDP_QUEUE_MASK &
  630. - queue_scan];
  631. + urb_slot = &endp->urb_list[queue_scan &
  632. + ENDP_QUEUE_MASK];
  633. break;
  634. } else
  635. continue;
  636. }
  637. while (++queue_list < ENDP_QUEUE_SIZE && --queue_size > 0) {
  638. - *urb_slot = endp->urb_list[ENDP_QUEUE_MASK &
  639. - ++queue_scan];
  640. - urb_slot = &endp->urb_list[ENDP_QUEUE_MASK &
  641. - queue_scan];
  642. + *urb_slot = endp->urb_list[++queue_scan & ENDP_QUEUE_MASK];
  643. + urb_slot = &endp->urb_list[queue_scan & ENDP_QUEUE_MASK];
  644. }
  645. if (urb_slot) {
  646. struct usb_hcd *hcd = u132_to_hcd(u132);
  647. @@ -2660,15 +2658,15 @@ static int u132_roothub_portreset(struct u132 *u132, int port_index)
  648. roothub.portstatus[port_index], &portstat);
  649. if (retval)
  650. return retval;
  651. - if (RH_PS_PRS & portstat)
  652. + if (portstat & RH_PS_PRS)
  653. continue;
  654. else
  655. break;
  656. } while (tick_before(now, reset_done));
  657. - if (RH_PS_PRS & portstat)
  658. + if (portstat & RH_PS_PRS)
  659. return -ENODEV;
  660. - if (RH_PS_CCS & portstat) {
  661. - if (RH_PS_PRSC & portstat) {
  662. + if (portstat & RH_PS_CCS) {
  663. + if (portstat & RH_PS_PRSC) {
  664. retval = u132_write_pcimem(u132,
  665. roothub.portstatus[port_index],
  666. RH_PS_PRSC);
  667. diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c
  668. index 1b28a00..f0eb570 100644
  669. --- a/drivers/usb/host/uhci-debug.c
  670. +++ b/drivers/usb/host/uhci-debug.c
  671. @@ -345,7 +345,7 @@ static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
  672.  
  673. out += sprintf(out, " usbint = %04x\n", usbint);
  674. out += sprintf(out, " usbfrnum = (%d)%03x\n", (usbfrnum >> 10) & 1,
  675. - 0xfff & (4*(unsigned int)usbfrnum));
  676. + (4 * (unsigned int) usbfrnum) & 0xfff);
  677. out += sprintf(out, " flbaseadd = %08x\n", flbaseadd);
  678. out += sprintf(out, " sof = %02x\n", sof);
  679. if (out - buf > len)
  680. diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
  681. index c17ea15..344756c 100644
  682. --- a/drivers/usb/host/uhci-q.c
  683. +++ b/drivers/usb/host/uhci-q.c
  684. @@ -883,7 +883,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,
  685. goto nomem;
  686. *plink = LINK_TO_TD(uhci, td);
  687.  
  688. - uhci_fill_td(uhci, td, 0, USB_PID_OUT | uhci_explen(0), 0);
  689. + uhci_fill_td(uhci, td, 0, uhci_explen(0) | USB_PID_OUT, 0);
  690. wmb();
  691. qh->dummy_td->status |= cpu_to_hc32(uhci, TD_CTRL_ACTIVE);
  692. qh->dummy_td = td;
  693. @@ -1038,7 +1038,7 @@ static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,
  694. goto nomem;
  695. *plink = LINK_TO_TD(uhci, td);
  696.  
  697. - uhci_fill_td(uhci, td, 0, USB_PID_OUT | uhci_explen(0), 0);
  698. + uhci_fill_td(uhci, td, 0, uhci_explen(0) | USB_PID_OUT, 0);
  699. wmb();
  700. qh->dummy_td->status |= cpu_to_hc32(uhci, TD_CTRL_ACTIVE);
  701. qh->dummy_td = td;
  702. diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c
  703. index 5e48a60..805b98c 100644
  704. --- a/drivers/usb/host/whci/qset.c
  705. +++ b/drivers/usb/host/whci/qset.c
  706. @@ -207,7 +207,7 @@ enum whc_update qset_add_qtds(struct whc *whc, struct whc_qset *qset)
  707. if (usb_pipecontrol(std->urb->pipe))
  708. memcpy(qtd->setup, std->urb->setup_packet, 8);
  709.  
  710. - status = QTD_STS_ACTIVE | QTD_STS_LEN(std->len);
  711. + status = QTD_STS_LEN(std->len) | QTD_STS_ACTIVE;
  712.  
  713. if (whc_std_last(std) && usb_pipeout(std->urb->pipe))
  714. status |= QTD_STS_LAST_PKT;
  715. diff --git a/drivers/usb/host/whci/whci-hc.h b/drivers/usb/host/whci/whci-hc.h
  716. index 4d4cbc0..319b5a5 100644
  717. --- a/drivers/usb/host/whci/whci-hc.h
  718. +++ b/drivers/usb/host/whci/whci-hc.h
  719. @@ -61,7 +61,7 @@ struct whc_qtd {
  720. #define QTD_STS_LAST_PKT (1 << 26) /* set Last Packet Flag in WUSB header */
  721. #define QTD_STS_INACTIVE (1 << 25) /* queue set is marked inactive */
  722. #define QTD_STS_IALT_VALID (1 << 23) /* iAlt field is valid */
  723. -#define QTD_STS_IALT(i) (QTD_STS_IALT_VALID | ((i) << 20)) /* iAlt field */
  724. +#define QTD_STS_IALT(i) (((i) << 20) | QTD_STS_IALT_VALID) /* iAlt field */
  725. #define QTD_STS_LEN(l) ((l) << 0) /* transfer length */
  726. #define QTD_STS_TO_LEN(s) ((s) & 0x000fffff)
  727.  
  728. diff --git a/drivers/usb/host/whci/wusb.c b/drivers/usb/host/whci/wusb.c
  729. index 8d27626..ab7caab 100644
  730. --- a/drivers/usb/host/whci/wusb.c
  731. +++ b/drivers/usb/host/whci/wusb.c
  732. @@ -147,7 +147,7 @@ static int whc_set_key(struct whc *whc, u8 key_index, uint32_t tkid,
  733. int ret;
  734.  
  735. memcpy(seckey, key, key_size);
  736. - setkeycmd = WUSBSETSECKEYCMD_SET | WUSBSETSECKEYCMD_IDX(key_index);
  737. + setkeycmd = WUSBSETSECKEYCMD_IDX(key_index) | WUSBSETSECKEYCMD_SET;
  738. if (is_gtk)
  739. setkeycmd |= WUSBSETSECKEYCMD_GTK;
  740.  
  741. @@ -183,7 +183,7 @@ int whc_set_ptk(struct wusbhc *wusbhc, u8 port_idx, u32 tkid,
  742. goto out;
  743.  
  744. di->addr_sec_info &= ~WHC_DI_KEY_IDX_MASK;
  745. - di->addr_sec_info |= WHC_DI_SECURE | WHC_DI_KEY_IDX(port_idx);
  746. + di->addr_sec_info |= WHC_DI_KEY_IDX(port_idx) | WHC_DI_SECURE;
  747. } else
  748. di->addr_sec_info &= ~WHC_DI_SECURE;
  749.  
  750. diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
  751. index 0230965..46d6a1a 100644
  752. --- a/drivers/usb/host/xhci-hub.c
  753. +++ b/drivers/usb/host/xhci-hub.c
  754. @@ -527,7 +527,7 @@ void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
  755. temp = readl(port_array[port_id]);
  756. temp = xhci_port_state_to_neutral(temp);
  757. temp &= ~PORT_PLS_MASK;
  758. - temp |= PORT_LINK_STROBE | link_state;
  759. + temp |= link_state | PORT_LINK_STROBE;
  760. writel(temp, port_array[port_id]);
  761. }
  762.  
  763. diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
  764. index d034f92..9680953 100644
  765. --- a/drivers/usb/host/xhci-mem.c
  766. +++ b/drivers/usb/host/xhci-mem.c
  767. @@ -2359,7 +2359,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
  768. xhci_dbg_trace(xhci, trace_xhci_dbg_init,
  769. "Supported page size register = 0x%x", page_size);
  770. for (i = 0; i < 16; i++) {
  771. - if ((0x1 & page_size) != 0)
  772. + if (page_size & 0x1)
  773. break;
  774. page_size = page_size >> 1;
  775. }
  776. diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
  777. index 6c5e813..2bf17f2 100644
  778. --- a/drivers/usb/host/xhci-ring.c
  779. +++ b/drivers/usb/host/xhci-ring.c
  780. @@ -3467,7 +3467,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
  781. /* FIXME better way to translate setup_packet into two u32 fields? */
  782. setup = (struct usb_ctrlrequest *) urb->setup_packet;
  783. field = 0;
  784. - field |= TRB_IDT | TRB_TYPE(TRB_SETUP);
  785. + field |= TRB_TYPE(TRB_SETUP) | TRB_IDT;
  786. if (start_cycle == 0)
  787. field |= 0x1;
  788.  
  789. @@ -3491,7 +3491,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
  790. /* If there's data, queue data TRBs */
  791. /* Only set interrupt on short packet for IN endpoints */
  792. if (usb_urb_dir_in(urb))
  793. - field = TRB_ISP | TRB_TYPE(TRB_DATA);
  794. + field = TRB_TYPE(TRB_DATA) | TRB_ISP;
  795. else
  796. field = TRB_TYPE(TRB_DATA);
  797.  
  798. --
  799. 2.6.3
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!