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

staging: emxx_udc: remove local TRUE/FALSE definition

As the function argument and variables are defined as type 'bool',
remove local TRUE/FALSE define and change usage of those macros
with boolean value.

Signed-off-by: Saiyam Doshi <saiyamdoshi.in@gmail.com>
Link: https://lore.kernel.org/r/20190908175247.GA20699@SD
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Saiyam Doshi and committed by
Greg Kroah-Hartman
8b77d94e 8692b047

+38 -43
+38 -38
drivers/staging/emxx_udc/emxx_udc.c
··· 165 165 udc->ep0_req.req.buf = p_buf; 166 166 udc->ep0_req.req.length = length; 167 167 udc->ep0_req.req.dma = 0; 168 - udc->ep0_req.req.zero = TRUE; 168 + udc->ep0_req.req.zero = true; 169 169 udc->ep0_req.req.complete = _nbu2ss_ep0_complete; 170 170 udc->ep0_req.req.status = -EINPROGRESS; 171 171 udc->ep0_req.req.context = udc; ··· 668 668 if ((req->req.actual % EP0_PACKETSIZE) == 0) { 669 669 if (req->zero) { 670 670 req->zero = false; 671 - EP0_send_NULL(udc, FALSE); 671 + EP0_send_NULL(udc, false); 672 672 return 1; 673 673 } 674 674 } ··· 695 695 i_remain_size -= result; 696 696 697 697 if (i_remain_size == 0) { 698 - EP0_send_NULL(udc, FALSE); 698 + EP0_send_NULL(udc, false); 699 699 return result; 700 700 } 701 701 ··· 754 754 if ((req->req.actual % EP0_PACKETSIZE) == 0) { 755 755 if (req->zero) { 756 756 req->zero = false; 757 - EP0_receive_NULL(udc, FALSE); 757 + EP0_receive_NULL(udc, false); 758 758 return 1; 759 759 } 760 760 } ··· 799 799 if (req->dma_flag) 800 800 return 1; /* DMA is forwarded */ 801 801 802 - req->dma_flag = TRUE; 802 + req->dma_flag = true; 803 803 p_buffer = req->req.dma; 804 804 p_buffer += req->req.actual; 805 805 ··· 997 997 if (req->req.actual == 0) 998 998 _nbu2ss_dma_map_single(udc, ep, req, USB_DIR_IN); 999 999 #endif 1000 - req->dma_flag = TRUE; 1000 + req->dma_flag = true; 1001 1001 1002 1002 /* MAX Packet Size */ 1003 1003 mpkt = _nbu2ss_readl(&preg->EP_REGS[num].EP_PCKT_ADRS) & EPN_MPKT; ··· 1166 1166 { 1167 1167 int nret = -EINVAL; 1168 1168 1169 - req->dma_flag = FALSE; 1169 + req->dma_flag = false; 1170 1170 req->div_len = 0; 1171 1171 1172 1172 if (req->req.length == 0) { ··· 1190 1190 break; 1191 1191 1192 1192 case EP0_IN_STATUS_PHASE: 1193 - nret = EP0_send_NULL(udc, TRUE); 1193 + nret = EP0_send_NULL(udc, true); 1194 1194 break; 1195 1195 1196 1196 default: ··· 1216 1216 static void _nbu2ss_restert_transfer(struct nbu2ss_ep *ep) 1217 1217 { 1218 1218 u32 length; 1219 - bool bflag = FALSE; 1219 + bool bflag = false; 1220 1220 struct nbu2ss_req *req; 1221 1221 1222 1222 req = list_first_entry_or_null(&ep->queue, struct nbu2ss_req, queue); ··· 1229 1229 1230 1230 length &= EPN_LDATA; 1231 1231 if (length < ep->ep.maxpacket) 1232 - bflag = TRUE; 1232 + bflag = true; 1233 1233 } 1234 1234 1235 1235 _nbu2ss_start_transfer(ep->udc, ep, req, bflag); ··· 1280 1280 1281 1281 if (bstall) { 1282 1282 /* Set STALL */ 1283 - ep->halted = TRUE; 1283 + ep->halted = true; 1284 1284 1285 1285 if (ep_adrs & USB_DIR_IN) 1286 1286 data = EPN_BCLR | EPN_ISTL; ··· 1290 1290 _nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, data); 1291 1291 } else { 1292 1292 /* Clear STALL */ 1293 - ep->stalled = FALSE; 1293 + ep->stalled = false; 1294 1294 if (ep_adrs & USB_DIR_IN) { 1295 1295 _nbu2ss_bitclr(&preg->EP_REGS[num].EP_CONTROL 1296 1296 , EPN_ISTL); ··· 1305 1305 , data); 1306 1306 } 1307 1307 1308 - ep->stalled = FALSE; 1308 + ep->stalled = false; 1309 1309 if (ep->halted) { 1310 - ep->halted = FALSE; 1310 + ep->halted = false; 1311 1311 _nbu2ss_restert_transfer(ep); 1312 1312 } 1313 1313 } ··· 1533 1533 /*-------------------------------------------------------------------------*/ 1534 1534 static int std_req_clear_feature(struct nbu2ss_udc *udc) 1535 1535 { 1536 - return _nbu2ss_req_feature(udc, FALSE); 1536 + return _nbu2ss_req_feature(udc, false); 1537 1537 } 1538 1538 1539 1539 /*-------------------------------------------------------------------------*/ 1540 1540 static int std_req_set_feature(struct nbu2ss_udc *udc) 1541 1541 { 1542 - return _nbu2ss_req_feature(udc, TRUE); 1542 + return _nbu2ss_req_feature(udc, true); 1543 1543 } 1544 1544 1545 1545 /*-------------------------------------------------------------------------*/ ··· 1601 1601 /*-------------------------------------------------------------------------*/ 1602 1602 static inline int _nbu2ss_decode_request(struct nbu2ss_udc *udc) 1603 1603 { 1604 - bool bcall_back = TRUE; 1604 + bool bcall_back = true; 1605 1605 int nret = -EINVAL; 1606 1606 struct usb_ctrlrequest *p_ctrl; 1607 1607 ··· 1623 1623 switch (p_ctrl->bRequest) { 1624 1624 case USB_REQ_GET_STATUS: 1625 1625 nret = std_req_get_status(udc); 1626 - bcall_back = FALSE; 1626 + bcall_back = false; 1627 1627 break; 1628 1628 1629 1629 case USB_REQ_CLEAR_FEATURE: 1630 1630 nret = std_req_clear_feature(udc); 1631 - bcall_back = FALSE; 1631 + bcall_back = false; 1632 1632 break; 1633 1633 1634 1634 case USB_REQ_SET_FEATURE: 1635 1635 nret = std_req_set_feature(udc); 1636 - bcall_back = FALSE; 1636 + bcall_back = false; 1637 1637 break; 1638 1638 1639 1639 case USB_REQ_SET_ADDRESS: 1640 1640 nret = std_req_set_address(udc); 1641 - bcall_back = FALSE; 1641 + bcall_back = false; 1642 1642 break; 1643 1643 1644 1644 case USB_REQ_SET_CONFIGURATION: ··· 1655 1655 if (nret >= 0) { 1656 1656 /*--------------------------------------*/ 1657 1657 /* Status Stage */ 1658 - nret = EP0_send_NULL(udc, TRUE); 1658 + nret = EP0_send_NULL(udc, true); 1659 1659 } 1660 1660 } 1661 1661 ··· 1688 1688 nret = _nbu2ss_ep0_in_transfer(udc, req); 1689 1689 if (nret == 0) { 1690 1690 udc->ep0state = EP0_OUT_STATUS_PAHSE; 1691 - EP0_receive_NULL(udc, TRUE); 1691 + EP0_receive_NULL(udc, true); 1692 1692 } 1693 1693 1694 1694 return 0; ··· 1708 1708 nret = _nbu2ss_ep0_out_transfer(udc, req); 1709 1709 if (nret == 0) { 1710 1710 udc->ep0state = EP0_IN_STATUS_PHASE; 1711 - EP0_send_NULL(udc, TRUE); 1711 + EP0_send_NULL(udc, true); 1712 1712 1713 1713 } else if (nret < 0) { 1714 1714 _nbu2ss_bitset(&udc->p_regs->EP0_CONTROL, EP0_BCLR); ··· 1817 1817 1818 1818 if (nret < 0) { 1819 1819 /* Send Stall */ 1820 - _nbu2ss_set_endpoint_stall(udc, 0, TRUE); 1820 + _nbu2ss_set_endpoint_stall(udc, 0, true); 1821 1821 } 1822 1822 } 1823 1823 ··· 1925 1925 1926 1926 preq->actual += req->div_len; 1927 1927 req->div_len = 0; 1928 - req->dma_flag = FALSE; 1928 + req->dma_flag = false; 1929 1929 1930 1930 #ifdef USE_DMA 1931 1931 _nbu2ss_dma_unmap_single(udc, ep, req, USB_DIR_IN); ··· 1961 1961 if (req->req.actual == req->req.length) { 1962 1962 if ((req->req.length % ep->ep.maxpacket) && !req->zero) { 1963 1963 req->div_len = 0; 1964 - req->dma_flag = FALSE; 1964 + req->dma_flag = false; 1965 1965 _nbu2ss_ep_done(ep, req, 0); 1966 1966 return; 1967 1967 } ··· 1990 1990 if ((req->req.actual % ep->ep.maxpacket) > 0) { 1991 1991 if (req->req.actual == req->div_len) { 1992 1992 req->div_len = 0; 1993 - req->dma_flag = FALSE; 1993 + req->dma_flag = false; 1994 1994 _nbu2ss_ep_done(ep, req, 0); 1995 1995 return; 1996 1996 } ··· 1998 1998 1999 1999 req->req.actual += req->div_len; 2000 2000 req->div_len = 0; 2001 - req->dma_flag = FALSE; 2001 + req->dma_flag = false; 2002 2002 2003 2003 _nbu2ss_epn_out_int(udc, ep, req); 2004 2004 } ··· 2187 2187 /* USB Interrupt Enable */ 2188 2188 _nbu2ss_bitset(&udc->p_regs->USB_INT_ENA, USB_INT_EN_BIT); 2189 2189 2190 - udc->udc_enabled = TRUE; 2190 + udc->udc_enabled = true; 2191 2191 2192 2192 return 0; 2193 2193 } ··· 2203 2203 static void _nbu2ss_disable_controller(struct nbu2ss_udc *udc) 2204 2204 { 2205 2205 if (udc->udc_enabled) { 2206 - udc->udc_enabled = FALSE; 2206 + udc->udc_enabled = false; 2207 2207 _nbu2ss_reset_controller(udc); 2208 2208 _nbu2ss_bitset(&udc->p_regs->EPCTR, (DIRPD | EPC_RST)); 2209 2209 } ··· 2456 2456 ep->direct = desc->bEndpointAddress & USB_ENDPOINT_DIR_MASK; 2457 2457 ep->ep_type = ep_type; 2458 2458 ep->wedged = 0; 2459 - ep->halted = FALSE; 2460 - ep->stalled = FALSE; 2459 + ep->halted = false; 2460 + ep->stalled = false; 2461 2461 2462 2462 ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize); 2463 2463 ··· 2588 2588 2589 2589 #ifdef USE_DMA 2590 2590 if ((uintptr_t)req->req.buf & 0x3) 2591 - req->unaligned = TRUE; 2591 + req->unaligned = true; 2592 2592 else 2593 - req->unaligned = FALSE; 2593 + req->unaligned = false; 2594 2594 2595 2595 if (req->unaligned) { 2596 2596 if (!ep->virt_buf) ··· 2616 2616 list_add_tail(&req->queue, &ep->queue); 2617 2617 2618 2618 if (bflag && !ep->stalled) { 2619 - result = _nbu2ss_start_transfer(udc, ep, req, FALSE); 2619 + result = _nbu2ss_start_transfer(udc, ep, req, false); 2620 2620 if (result < 0) { 2621 2621 dev_err(udc->dev, " *** %s, result = %d\n", __func__, 2622 2622 result); ··· 2704 2704 ep_adrs = ep->epnum | ep->direct; 2705 2705 if (value == 0) { 2706 2706 _nbu2ss_set_endpoint_stall(udc, ep_adrs, value); 2707 - ep->stalled = FALSE; 2707 + ep->stalled = false; 2708 2708 } else { 2709 2709 if (list_empty(&ep->queue)) 2710 2710 _nbu2ss_epn_set_stall(udc, ep); 2711 2711 else 2712 - ep->stalled = TRUE; 2712 + ep->stalled = true; 2713 2713 } 2714 2714 2715 2715 if (value == 0)
-5
drivers/staging/emxx_udc/emxx_udc.h
··· 19 19 #define USE_DMA 1 20 20 #define USE_SUSPEND_WAIT 1 21 21 22 - #ifndef TRUE 23 - #define TRUE 1 24 - #define FALSE 0 25 - #endif 26 - 27 22 /*------------ Board dependence(Resource) */ 28 23 #define VBUS_VALUE GPIO_VBUS 29 24