From patchwork Mon Dec 16 12:08:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Radhey Shyam Pandey X-Patchwork-Id: 1210347 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="pJQpxhAo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47c0TZ4Z9qz9sPT for ; Mon, 16 Dec 2019 23:10:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727519AbfLPMKX (ORCPT ); Mon, 16 Dec 2019 07:10:23 -0500 Received: from mail-bn8nam12on2067.outbound.protection.outlook.com ([40.107.237.67]:6046 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727473AbfLPMKW (ORCPT ); Mon, 16 Dec 2019 07:10:22 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TpPAQ1z9M9bfyHKcBuFxcZIGlhhtHmNeakJXMYuIdUup7mjAgD1+shCHtyndsqQRCxTgVfG4qRTUh4eiy/YvvSWktyfg19DY6i/GaLv4clH6v8gK4SYjOOyMp8DRFDXaQNCLdhzNgol1HULHHHHVjNkdGSaxBQdHYgUteNbmZFMnJpkcZr6vE+LtR733iJJgIfu6elw6nVGn+q4gSy/ewBHv4yHHyXrZeWYBTFqZ7CVIshenmOX1TnU/2qQ7oWZRcyLg8QM+OTJhe+DbEjGuUWMWeD23fD1pMAjhIhG+Upo5tJ0rclqypPTpJcgOycA5fI8rLmOWw83c3Ei4cbsp1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b3ezAtLSe9xP2+5D7r3cbNGC2JMI4J2cfvyH5CBsgZE=; b=OUeuLq3QRslnGPQUxxkVlh8gt+8pFAEw9+ClLzsSOFda0SRYa4VaXD6YCbkmtlyCt2Z4cmXy8i3xc/G/izenT5u5WEODeqPfYfLAOdSccyGTbTKmtRLfUvPD0HwsK8RecsxfuURvDe5yhxzz5O8EEPiXqe9EKSRMuqVPcG5FHXIx3hnOAzG4dk5CytnY1gVkGM9JBAN+KaBx0x6ZPM+p+4hkdK9lPxuO8omPAltPEXbWQDr3MCCdC/cRrtdr40o7HvcdjirZiwTgmQe4Kdy22okumirrAc3gZP+PPX42R3/hq2uSTN+uARowsHUFKSHd6D8uj9sI1dFZjpaqhqfT8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 149.199.60.83) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=xhdpunnaia40.localdomain; dmarc=none action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b3ezAtLSe9xP2+5D7r3cbNGC2JMI4J2cfvyH5CBsgZE=; b=pJQpxhAo5G6Sf8pVjYicHkyJ5nf9ydXv9w7SVW4j9k0JMNq/MpSxkvuOplCNnELOWhKL4NQImIi8Tn4ErEoQiGgSQir+AKEoFNkk1NY5WHm+BbZb3VEe7zTaJBsWDIQzKF8C5uGO0z+T3tdr/DWBfzK8oLjbYpKi5UbRO1N9uaM= Received: from CY4PR14CA0037.namprd14.prod.outlook.com (2603:10b6:903:101::23) by DM6PR02MB6043.namprd02.prod.outlook.com (2603:10b6:5:1f8::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.19; Mon, 16 Dec 2019 12:08:39 +0000 Received: from CY1NAM02FT019.eop-nam02.prod.protection.outlook.com (2603:10b6:903:101:cafe::54) by CY4PR14CA0037.outlook.office365.com (2603:10b6:903:101::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.15 via Frontend Transport; Mon, 16 Dec 2019 12:08:39 +0000 Authentication-Results: spf=none (sender IP is 149.199.60.83) smtp.mailfrom=xhdpunnaia40.localdomain; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=xilinx.com; Received-SPF: None (protection.outlook.com: xhdpunnaia40.localdomain does not designate permitted sender hosts) Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT019.mail.protection.outlook.com (10.152.75.177) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2538.14 via Frontend Transport; Mon, 16 Dec 2019 12:08:39 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAz-0001l8-CK; Mon, 16 Dec 2019 04:08:37 -0800 Received: from [127.0.0.1] (helo=xsj-smtp-dlp2.xlnx.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAt-0000wi-KB; Mon, 16 Dec 2019 04:08:31 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id xBGC8U55024882; Mon, 16 Dec 2019 04:08:30 -0800 Received: from [10.140.184.180] (helo=xhdpunnaia40.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAs-0000wL-AP; Mon, 16 Dec 2019 04:08:30 -0800 Received: by xhdpunnaia40.localdomain (Postfix, from userid 13245) id 860A01053CD; Mon, 16 Dec 2019 17:38:29 +0530 (IST) From: Radhey Shyam Pandey To: davem@davemloft.net, michal.simek@xilinx.com Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, git@xilinx.com, Radhey Shyam Pandey Subject: [PATCH net-next 1/3] net: emaclite: Fix coding style Date: Mon, 16 Dec 2019 17:38:08 +0530 Message-Id: <1576498090-1277-2-git-send-email-radhey.shyam.pandey@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576498090-1277-1-git-send-email-radhey.shyam.pandey@xilinx.com> References: <1576498090-1277-1-git-send-email-radhey.shyam.pandey@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-Result: No--2.380-7.0-31-1 X-imss-scan-details: No--2.380-7.0-31-1;No--2.380-5.0-31-1 X-TM-AS-User-Approved-Sender: No;No X-TM-AS-Result-Xfilter: Match text exemption rules:No X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(346002)(39860400002)(376002)(396003)(428003)(249900001)(199004)(189003)(8936002)(42186006)(6636002)(81166006)(81156014)(8676002)(70206006)(70586007)(42882007)(107886003)(2906002)(336012)(6266002)(36756003)(6666004)(356004)(4326008)(5660300002)(26005)(450100002)(498600001)(2616005)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR02MB6043; H:xsj-pvapsmtpgw01; FPR:; SPF:None; LANG:en; PTR:unknown-60-83.xilinx.com; A:0; MX:0; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1098f3c-3f0c-4cda-049d-08d78220af8f X-MS-TrafficTypeDiagnostic: DM6PR02MB6043: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 02530BD3AA X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jZU+HntLxV1p96m9QWLJkllzbsIyt+Yyyf9z0hFJfJJMZCGZcDzNYguMUAkr/fJpeTaTP89NSOiee/ojIXIzQKaGZxEchs8WDf8c7obbufttd0ItKA8JsUJiGv2/XpWkTJxhLjQDe/1V+4ytGlDrOn9Ymey4HQi/NbSR3rgh6+8/5mby64lzbxxzSgnvZUaMchfRDp5zDRrLUgmzkJDXDKv2YFEBEcm7wQuhFxqSbgxmXZe8qddjGImJbOxo1BxPbWd914XL7G+vlG5b6h6JM/bozNy5aUQaVCkEA++I58OXD6EBfKSbqzPitPr+fIKYHuGB5pmpFDyQ6Pecu7/88yx4z32f2uVCZd/ELdLoeLHNwMZoBQhve8TFSmNpxaht9lVZmrjfSzvOJcbKQ13lUscgVPdixROn1FgN7M7o9xeEpxLdvt227HWAP0UtPXA/ X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2019 12:08:39.0433 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1098f3c-3f0c-4cda-049d-08d78220af8f X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB6043 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make coding style changes to fix checkpatch script warnings. There is no functional change. Fixes below check and warnings- CHECK: Blank lines aren't necessary after an open brace '{' CHECK: spinlock_t definition without comment CHECK: Please don't use multiple blank lines WARNING: Prefer 'unsigned int' to bare use of 'unsigned' CHECK: braces {} should be used on all arms of this statement CHECK: Unbalanced braces around else statement CHECK: Alignment should match open parenthesis WARNING: Missing a blank line after declarations Signed-off-by: Radhey Shyam Pandey --- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 35 ++++++++++++--------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 0c26f5b..4aa6752 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -/* - * Xilinx EmacLite Linux driver for the Xilinx Ethernet MAC Lite device. +/* Xilinx EmacLite Linux driver for the Xilinx Ethernet MAC Lite device. * * This is a new flat driver which is based on the original emac_lite * driver from John Williams . @@ -91,8 +90,6 @@ #define XEL_ARP_PACKET_SIZE 28 /* Max ARP packet size */ #define XEL_HEADER_IP_LENGTH_OFFSET 16 /* IP Length Offset */ - - #define TX_TIMEOUT (60 * HZ) /* Tx timeout is 60 seconds. */ #define ALIGNMENT 4 @@ -124,7 +121,6 @@ * @last_link: last link status */ struct net_local { - struct net_device *ndev; bool tx_ping_pong; @@ -133,7 +129,7 @@ struct net_local { u32 next_rx_buf_to_use; void __iomem *base_addr; - spinlock_t reset_lock; + spinlock_t reset_lock; /* lock used for synchronization */ struct sk_buff *deferred_skb; struct phy_device *phy_dev; @@ -144,7 +140,6 @@ struct net_local { int last_link; }; - /*************************/ /* EmacLite driver calls */ /*************************/ @@ -207,7 +202,7 @@ static void xemaclite_disable_interrupts(struct net_local *drvdata) * address in the EmacLite device. */ static void xemaclite_aligned_write(void *src_ptr, u32 *dest_ptr, - unsigned length) + unsigned int length) { u32 align_buffer; u32 *to_u32_ptr; @@ -264,7 +259,7 @@ static void xemaclite_aligned_write(void *src_ptr, u32 *dest_ptr, * to a 16-bit aligned buffer. */ static void xemaclite_aligned_read(u32 *src_ptr, u8 *dest_ptr, - unsigned length) + unsigned int length) { u16 *to_u16_ptr, *from_u16_ptr; u32 *from_u32_ptr; @@ -329,7 +324,6 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET); if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK | XEL_TSR_XMIT_ACTIVE_MASK)) == 0) { - /* Switch to next buffer if configured */ if (drvdata->tx_ping_pong != 0) drvdata->next_tx_buf_to_use ^= XEL_BUFFER_OFFSET; @@ -345,8 +339,9 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK | XEL_TSR_XMIT_ACTIVE_MASK)) != 0) return -1; /* Buffers were full, return failure */ - } else + } else { return -1; /* Buffer was full, return failure */ + } /* Write the frame to the buffer */ xemaclite_aligned_write(data, (u32 __force *)addr, byte_count); @@ -421,7 +416,6 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) * or an IP packet or an ARP packet */ if (proto_type > ETH_DATA_LEN) { - if (proto_type == ETH_P_IP) { length = ((ntohl(xemaclite_readl(addr + XEL_HEADER_IP_LENGTH_OFFSET + @@ -431,23 +425,25 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) length = min_t(u16, length, ETH_DATA_LEN); length += ETH_HLEN + ETH_FCS_LEN; - } else if (proto_type == ETH_P_ARP) + } else if (proto_type == ETH_P_ARP) { length = XEL_ARP_PACKET_SIZE + ETH_HLEN + ETH_FCS_LEN; - else + } else { /* Field contains type other than IP or ARP, use max * frame size and let user parse it */ length = ETH_FRAME_LEN + ETH_FCS_LEN; - } else + } + } else { /* Use the length in the frame, plus the header and trailer */ length = proto_type + ETH_HLEN + ETH_FCS_LEN; + } if (WARN_ON(length > maxlen)) length = maxlen; /* Read from the EmacLite device */ xemaclite_aligned_read((u32 __force *)(addr + XEL_RXBUFF_OFFSET), - data, length); + data, length); /* Acknowledge the frame */ reg_data = xemaclite_readl(addr + XEL_RSR_OFFSET); @@ -668,8 +664,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) /* Check if the Transmission for the first buffer is completed */ tx_status = xemaclite_readl(base_addr + XEL_TSR_OFFSET); if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) && - (tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) { - + (tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) { tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK; xemaclite_writel(tx_status, base_addr + XEL_TSR_OFFSET); @@ -679,8 +674,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) /* Check if the Transmission for the second buffer is completed */ tx_status = xemaclite_readl(base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET); if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) && - (tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) { - + (tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) { tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK; xemaclite_writel(tx_status, base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET); @@ -837,6 +831,7 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev) of_address_to_resource(npp, 0, &res); if (lp->ndev->mem_start != res.start) { struct phy_device *phydev; + phydev = of_phy_find_device(lp->phy_node); if (!phydev) dev_info(dev, From patchwork Mon Dec 16 12:08:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Radhey Shyam Pandey X-Patchwork-Id: 1210344 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="mEBlxcc7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47c0Rh0rj8z9sRM for ; Mon, 16 Dec 2019 23:08:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727607AbfLPMIo (ORCPT ); Mon, 16 Dec 2019 07:08:44 -0500 Received: from mail-bn7nam10on2047.outbound.protection.outlook.com ([40.107.92.47]:6182 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727481AbfLPMIn (ORCPT ); Mon, 16 Dec 2019 07:08:43 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bR0srpkNKDAL8K6HIHLHzD+5NhMlP3dbfIxQZLMzA5XDtrk+iX/nvXJ8lZWKy+xYTuJxKn7OiKyoVMH5B/2+pIY7/6eEXtLkkKvACbb47SQ9liL0pA/YoAxXRLo1yDSXCALu2SrMW1F1mPBs1LPZZDK5j7k1gIlRwBgevqbL80hS6KqQivP106rG4dkMo6FyzFF9nCLtueSXvw027njYRrS0QsylbNCw52GosD3E6NUZf41k3rp4lGzDprYuLO7J2P4XVZK2GAzCWm9japQHat68BoGc9Kg4JEiOguY8XX8mJf0w1RVOwusphy8xZzCENhxboW5K3U1hqt1SkmjEIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bSl7E8xxECs4dyA+dTDWm/ZsppKl25xdERZ8frrwWdQ=; b=HbaPzkl1wLVIdkEPuC9SCl0qhReMFIH5WHT1EMezJv5TNBUAyVlWZDVZxH1hnujiWTSCfJ3MMR9yLi3WWjTuLnNXOR1vnQCzXYGjLstwkgPw5N7KxKuLfoOz688zpWS6e3oLX1f6PFP3Up/3xTOIp/M6oEL3BUE2ZvvMCws1/DVkI5jnRaNaczAotPDcwwFeZW/6kaR0pUqnfi1CCJhoOyys1Mfz5h7gFYf0o8DpVKzrdXolSS4loKZv2+dsD4YcDkyaJZL7wn2lIMrZZvLBk7Mn1zijOS8vWToboAIB7pm4U4Xik5OjHburiRp2RQ3D6oWAj54NihEx/jsL3tkm8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 149.199.60.83) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=xhdpunnaia40.localdomain; dmarc=none action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bSl7E8xxECs4dyA+dTDWm/ZsppKl25xdERZ8frrwWdQ=; b=mEBlxcc7rfnDLbVPjGggj7opw2QrVyhaCo3nIMAMx+prVFpnuykFIwgtO3HTEYl2klIz/4NwXuObU9tlIPEhNk+Um7g1q2eZJyMbdWdvQq6t2aj3PoXR8iTJqGaDxdIPy1Sg93eYUd4ERb8EHc0BDQeoQGUWfq2F9ake6oxiPXw= Received: from SN2PR01CA0023.prod.exchangelabs.com (2603:10b6:804:2::33) by MN2PR02MB6703.namprd02.prod.outlook.com (2603:10b6:208:1d2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.18; Mon, 16 Dec 2019 12:08:39 +0000 Received: from SN1NAM02FT015.eop-nam02.prod.protection.outlook.com (2603:10b6:804:2:cafe::2) by SN2PR01CA0023.outlook.office365.com (2603:10b6:804:2::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.15 via Frontend Transport; Mon, 16 Dec 2019 12:08:39 +0000 Authentication-Results: spf=none (sender IP is 149.199.60.83) smtp.mailfrom=xhdpunnaia40.localdomain; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=xilinx.com; Received-SPF: None (protection.outlook.com: xhdpunnaia40.localdomain does not designate permitted sender hosts) Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT015.mail.protection.outlook.com (10.152.72.109) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2538.14 via Frontend Transport; Mon, 16 Dec 2019 12:08:38 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAz-0001l9-CL; Mon, 16 Dec 2019 04:08:37 -0800 Received: from [127.0.0.1] (helo=xsj-smtp-dlp2.xlnx.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAt-0000we-Md; Mon, 16 Dec 2019 04:08:31 -0800 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id xBGC8U8i024878; Mon, 16 Dec 2019 04:08:30 -0800 Received: from [10.140.184.180] (helo=xhdpunnaia40.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAs-0000wN-Au; Mon, 16 Dec 2019 04:08:30 -0800 Received: by xhdpunnaia40.localdomain (Postfix, from userid 13245) id 88E541053CE; Mon, 16 Dec 2019 17:38:29 +0530 (IST) From: Radhey Shyam Pandey To: davem@davemloft.net, michal.simek@xilinx.com Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, git@xilinx.com, Radhey Shyam Pandey Subject: [PATCH net-next 2/3] net: emaclite: In kconfig remove arch dependency Date: Mon, 16 Dec 2019 17:38:09 +0530 Message-Id: <1576498090-1277-3-git-send-email-radhey.shyam.pandey@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576498090-1277-1-git-send-email-radhey.shyam.pandey@xilinx.com> References: <1576498090-1277-1-git-send-email-radhey.shyam.pandey@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-Result: No-0.229-7.0-31-1 X-imss-scan-details: No-0.229-7.0-31-1;No-0.229-5.0-31-1 X-TM-AS-User-Approved-Sender: No;No X-TM-AS-Result-Xfilter: Match text exemption rules:No X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(396003)(376002)(346002)(136003)(39860400002)(428003)(249900001)(199004)(189003)(81166006)(107886003)(5660300002)(6266002)(450100002)(8676002)(2616005)(4744005)(26005)(36756003)(4326008)(42186006)(8936002)(2906002)(42882007)(70206006)(70586007)(336012)(316002)(498600001)(81156014)(356004)(6666004)(6636002); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR02MB6703; H:xsj-pvapsmtpgw01; FPR:; SPF:None; LANG:en; PTR:unknown-60-83.xilinx.com; A:0; MX:0; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4355b4f3-80d4-4252-5268-08d78220af74 X-MS-TrafficTypeDiagnostic: MN2PR02MB6703: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 02530BD3AA X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Kz4Pfz+SLCTCwojs2/s/hS3qLpnqQuZAzipqaw2sNqc/K6+HJKgGYv1l8MrSH16T5D4inFi0rAjXJDUkpctX0N2NClKgSGqkhwAjsR19+G0oKcvQG6+az+weDxytR4tme3N4973KlMuVEImElARu7nVUl2/BS3mVa0u7QBugXRoy8bc08PgtViE3iOdE3tnLG7hUahedjZeXG0KfpRKHAlNnwzBGcIuaDtP5/8wmTUmaO/k1wPjz2eKxJiHzAT4y0+FCG+91g4OnSAR9l2fWEdBJ5shOCkyCcfxFlkgCVmkx00cKAIw/4Ayo9H7LVkiM6/MS7cXsuHqUvqFkC47D3F2v0ZfPnAbHoy1N6/mlT1Wf9/geOmrKyTKt45ZyP6X1OTrjVJXB8EyYUzTfgQMqHuRmVK/H1B9+7KsWfoEuyorAOrSojIxAefJ99jFBa3t X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2019 12:08:38.9300 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4355b4f3-80d4-4252-5268-08d78220af74 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR02MB6703 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To enable xilinx_emaclite driver support on zynqmp ultrascale platform (ARCH64) remove the obsolete ARCH dependency list. Also include HAS_IOMEM dependency to avoid compilation failure on architectures without IOMEM. Sanity build test done for microblaze, zynq and zynqmp ultrascale platform. Signed-off-by: Radhey Shyam Pandey --- drivers/net/ethernet/xilinx/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig index 6304ebd..0692dd1 100644 --- a/drivers/net/ethernet/xilinx/Kconfig +++ b/drivers/net/ethernet/xilinx/Kconfig @@ -18,8 +18,8 @@ if NET_VENDOR_XILINX config XILINX_EMACLITE tristate "Xilinx 10/100 Ethernet Lite support" - depends on PPC32 || MICROBLAZE || ARCH_ZYNQ || MIPS select PHYLIB + depends on HAS_IOMEM ---help--- This driver supports the 10/100 Ethernet Lite from Xilinx. From patchwork Mon Dec 16 12:08:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Radhey Shyam Pandey X-Patchwork-Id: 1210345 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="Lew8wZjT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47c0Rq64Jbz9sRM for ; Mon, 16 Dec 2019 23:08:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727652AbfLPMIu (ORCPT ); Mon, 16 Dec 2019 07:08:50 -0500 Received: from mail-mw2nam12on2049.outbound.protection.outlook.com ([40.107.244.49]:6149 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727383AbfLPMIn (ORCPT ); Mon, 16 Dec 2019 07:08:43 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CNJOg6bpp/wMpKrvtRWYe5/WrfjE57nEAdgLB5Or+rIwXIRKgTYW+FUvbs+ImJKU4Zjcz0VTfr7jeKjeXY1C0Nn+bj0F5HKBTdkRtMBg6CZmj9NT30TqXA1oQRamvll55cw8C/lgY/jKAwGyqdVxITGcTMTIsZClyP+uAEtKSwUGVVaPIWmA2JaOlxyNppH41WJjy6uKHXDCf3lTJal0iJGdzR+oJpOGfGbs+ylS9ta+Q4PTUdao+09pxA2sRGPvG8U/B28Q7MQ97HnC+6WQsDtvUHxzCxw7oC8pjurhCBoP8gHxv6Beak1lRhKFKJ1qOZk12yRLuYrJHJni1rlekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IBCFQwd3d+v8DAd6a0gpnoZB48tO0AIfG5VoTw6oApA=; b=GjkwUt7hsb6mjZ5cVS04mppaspbreFYPxRnZMWwceW9ivPFnqSHiIVnH2N+5kMGy43dXxPXn7WtYNh5dipDUF4svN1sQ7nUd5DcwABx7Hw9rpzYs3OA/U3cCDMHw76hu8m4VeIs2uH5WBUCEtuLyh9Xgsw1x/xSk8ge6sZSZp3+5sfcmOMWXkNj5XLf6Wc3nhvAv4zpVL97/eb/tkqVlAp8mVb5Qo/O7Gq3jNgf5DKZyqHe2upl/u2eA5JqytFvi3bDFR/yJ/dl/1D2wQwPHwnWJ/4Bppl5JNNZi9IzjROx5rXmIM2Ud1NoFZBE8U1xm19lj1A3L7odHnEzgBPBbwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 149.199.60.83) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=xhdpunnaia40.localdomain; dmarc=none action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IBCFQwd3d+v8DAd6a0gpnoZB48tO0AIfG5VoTw6oApA=; b=Lew8wZjTbTjkoPj9YNExK4jrmkiyBhFXAtg9uYLZKCh89PzXofX4sprZVQjFNSj5brYl+WXGz0dZAA5ANsojpU57DmSI19W5PIRPRQCdoyZPylq2tzeyEOwHkKkhNm+Fz9U4Xy4hyGHBC3+kVEQI+O3aaYZbVod3+VbDFEZllJA= Received: from DM6PR06CA0019.namprd06.prod.outlook.com (2603:10b6:5:120::32) by SN6PR02MB4366.namprd02.prod.outlook.com (2603:10b6:805:a6::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.18; Mon, 16 Dec 2019 12:08:39 +0000 Received: from CY1NAM02FT031.eop-nam02.prod.protection.outlook.com (2603:10b6:5:120:cafe::8) by DM6PR06CA0019.outlook.office365.com (2603:10b6:5:120::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.18 via Frontend Transport; Mon, 16 Dec 2019 12:08:39 +0000 Authentication-Results: spf=none (sender IP is 149.199.60.83) smtp.mailfrom=xhdpunnaia40.localdomain; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=xilinx.com; Received-SPF: None (protection.outlook.com: xhdpunnaia40.localdomain does not designate permitted sender hosts) Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT031.mail.protection.outlook.com (10.152.75.180) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2538.14 via Frontend Transport; Mon, 16 Dec 2019 12:08:39 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAz-0001lB-FS; Mon, 16 Dec 2019 04:08:37 -0800 Received: from [127.0.0.1] (helo=xsj-smtp-dlp2.xlnx.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAt-0000wj-QK; Mon, 16 Dec 2019 04:08:31 -0800 Received: from xsj-pvapsmtp01 (smtp-fallback.xilinx.com [149.199.38.66] (may be forged)) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id xBGC8Ur0024884; Mon, 16 Dec 2019 04:08:31 -0800 Received: from [10.140.184.180] (helo=xhdpunnaia40.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1igpAs-0000wO-Bp; Mon, 16 Dec 2019 04:08:30 -0800 Received: by xhdpunnaia40.localdomain (Postfix, from userid 13245) id 916481053CF; Mon, 16 Dec 2019 17:38:29 +0530 (IST) From: Radhey Shyam Pandey To: davem@davemloft.net, michal.simek@xilinx.com Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, git@xilinx.com, Radhey Shyam Pandey Subject: [PATCH net-next 3/3] net: emaclite: Fix arm64 compilation warnings Date: Mon, 16 Dec 2019 17:38:10 +0530 Message-Id: <1576498090-1277-4-git-send-email-radhey.shyam.pandey@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576498090-1277-1-git-send-email-radhey.shyam.pandey@xilinx.com> References: <1576498090-1277-1-git-send-email-radhey.shyam.pandey@xilinx.com> MIME-Version: 1.0 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-Result: No-1.563-7.0-31-1 X-imss-scan-details: No-1.563-7.0-31-1;No-1.563-5.0-31-1 X-TM-AS-User-Approved-Sender: No;No X-TM-AS-Result-Xfilter: Match text exemption rules:No X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(396003)(39860400002)(346002)(136003)(376002)(428003)(249900001)(199004)(189003)(356004)(70206006)(6666004)(70586007)(5660300002)(6636002)(2616005)(498600001)(107886003)(42186006)(316002)(8936002)(81156014)(81166006)(2906002)(336012)(8676002)(450100002)(4326008)(42882007)(6266002)(36756003)(26005)(42866002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR02MB4366; H:xsj-pvapsmtpgw01; FPR:; SPF:None; LANG:en; PTR:unknown-60-83.xilinx.com; A:0; MX:0; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57c84f0b-36ad-4cae-667a-08d78220af9d X-MS-TrafficTypeDiagnostic: SN6PR02MB4366: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:167; X-Forefront-PRVS: 02530BD3AA X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JruE5Vt8+rtnK6KRhEZ6utrHJJTNN6XWA7BaMxKg/ebrm32yakyjx3/uD2uA9H7/hVKRUwc7yf+ZByY+rae0nqeMqa5kArK+3c+EAn0JoVzhA2tRJTI7en/mqZ860Mv4HHfbn95uQS7eHMxzyz+3UNSXEPMDfJqDuYRaXkUOZU1WguKFsPAdIJzYuuKOFfhos7iWjV7IHLNPi6uWSKtqldSg8tXFfyxSgPsbs0oURRmmbL+XLG7xNemXCqeBLRVjk5Os2ie82ddbkMks6HcFgiP5d94fJYi20/9H/sq5YCdP32CeATsD1EpWUuXcANcL73WUyorBQu0zruY3tEn0/n6YRO0DTRDIj3W8Yk1XlyEUVx4lcLaOjVVGFwMST0sidocmBdFaPSOXhywIGJlA5QSNUeoaDFF1BZjbrj7TmzFUqPnOJU9ji8R/SPG639trpaOahzbILCtI2Sql0NB/8B5XLlJJlKkeeCpqd7tqpJpyKGq5CFWMwvkUyl/UBOZJ X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2019 12:08:39.1375 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57c84f0b-36ad-4cae-667a-08d78220af9d X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB4366 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Michal Simek Recast pointers with ulong instead of u32 for arm64. This patch fixes these compilation warnings: drivers/net/ethernet/xilinx/xilinx_emaclite.c: In function ‘xemaclite_send_data’: drivers/net/ethernet/xilinx/xilinx_emaclite.c:335:35: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] addr = (void __iomem __force *)((u32 __force)addr ^ ^ drivers/net/ethernet/xilinx/xilinx_emaclite.c:335:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] addr = (void __iomem __force *)((u32 __force)addr ^ ^ drivers/net/ethernet/xilinx/xilinx_emaclite.c: In function ‘xemaclite_recv_data’: drivers/net/ethernet/xilinx/xilinx_emaclite.c:397:36: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] addr = (void __iomem __force *)((u32 __force)addr ^ ^ drivers/net/ethernet/xilinx/xilinx_emaclite.c:397:11: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] addr = (void __iomem __force *)((u32 __force)addr ^ ^ drivers/net/ethernet/xilinx/xilinx_emaclite.c: In function ‘xemaclite_rx_handler’: drivers/net/ethernet/xilinx/xilinx_emaclite.c:97:42: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] #define BUFFER_ALIGN(adr) ((ALIGNMENT - ((u32)adr)) % ALIGNMENT) ^ drivers/net/ethernet/xilinx/xilinx_emaclite.c:612:10: note: in expansion of macro ‘BUFFER_ALIGN’ align = BUFFER_ALIGN(skb->data); ^~~~~~~~~~~~ In file included from ./include/linux/dma-mapping.h:7, from ./include/linux/skbuff.h:31, from ./include/linux/if_ether.h:19, from ./include/uapi/linux/ethtool.h:19, from ./include/linux/ethtool.h:18, from ./include/linux/netdevice.h:37, from drivers/net/ethernet/xilinx/xilinx_emaclite.c:12: drivers/net/ethernet/xilinx/xilinx_emaclite.c: In function ‘xemaclite_of_probe’: drivers/net/ethernet/xilinx/xilinx_emaclite.c:1191:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (unsigned int __force)lp->base_addr, ndev->irq); ^ ./include/linux/device.h:1780:33: note: in definition of macro ‘dev_info’ _dev_info(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~ Signed-off-by: Michal Simek Signed-off-by: Radhey Shyam Pandey --- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 4aa6752..cfb051a 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -94,7 +94,7 @@ #define ALIGNMENT 4 /* BUFFER_ALIGN(adr) calculates the number of bytes to the next alignment. */ -#define BUFFER_ALIGN(adr) ((ALIGNMENT - ((u32)adr)) % ALIGNMENT) +#define BUFFER_ALIGN(adr) ((ALIGNMENT - ((ulong)adr)) % ALIGNMENT) #ifdef __BIG_ENDIAN #define xemaclite_readl ioread32be @@ -332,7 +332,7 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, * if it is configured in HW */ - addr = (void __iomem __force *)((u32 __force)addr ^ + addr = (void __iomem __force *)((ulong __force)addr ^ XEL_BUFFER_OFFSET); reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET); @@ -394,7 +394,7 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) * will correct on subsequent calls */ if (drvdata->rx_ping_pong != 0) - addr = (void __iomem __force *)((u32 __force)addr ^ + addr = (void __iomem __force *)((ulong __force)addr ^ XEL_BUFFER_OFFSET); else return 0; /* No data was available */ @@ -1186,9 +1186,9 @@ static int xemaclite_of_probe(struct platform_device *ofdev) } dev_info(dev, - "Xilinx EmacLite at 0x%08X mapped to 0x%08X, irq=%d\n", + "Xilinx EmacLite at 0x%08X mapped to 0x%08lX, irq=%d\n", (unsigned int __force)ndev->mem_start, - (unsigned int __force)lp->base_addr, ndev->irq); + (unsigned long __force)lp->base_addr, ndev->irq); return 0; error: