From patchwork Fri Dec 20 08:56:58 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: 1213975 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="OUInLjhc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47fN1B68XTz9sR0 for ; Fri, 20 Dec 2019 19:57:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727459AbfLTI5a (ORCPT ); Fri, 20 Dec 2019 03:57:30 -0500 Received: from mail-dm6nam11on2085.outbound.protection.outlook.com ([40.107.223.85]:16768 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727084AbfLTI5W (ORCPT ); Fri, 20 Dec 2019 03:57:22 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DUHwC1ecoasqsQKF8qNMIzm4k03fHZJtwTFQFj/ue4U7C1roaiRNAs54pbpbJ7Csi0OD3pK+nuaT08ztCELHJkoKn1+Xrgde32rCt+Ko1+X0C5cE83qkQwGdOX3VpCmHXR4umZc9bnlhcyoeFNVG14hxKrLliw6s2BW86bOHg+Pm1wyQP3ghfNEl7nJoOizp+B/gqdPiVnTqWACJaUUZX/71fyNcK1EO3LC8c+YGrRs5DhlHamXota61XYpMlK4yiAPAEu/rpXRmLKVKayhnG8mTLGlJYDeLBGoMcCkMaV+hRCZQMLcBDfIMSPHBlHDx3r1zs5Dq1d7IbpMZQSrnFQ== 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=uMPatnnUQXHgD41Ks+lYOhCFaua62ymlbssx9Frc+i0=; b=f4HzX0S3wpHBv80CZb1TFrczXlrl/5eWEIPGFsD2P9DeK/yjQbv22wiQp5XiukQsfKOaLRgq+LXR7z7eQD1Tv0lHhRgruoilg/jOVYJf9XQTptfRag/2m+6UPPZ0qWGjUS7omSGLIUDinjIJAlK8R6np1mxjpfy2PkuzvVIXPrrPBcfrarQbF/xjOREPKcfaQ2KmjOdwiY+7dWSgZRVZD1SkHRqBc8OcdAlbtATguTt7Ib6lBkO4ds1oHL1r0f2/0MKn5+KKU0fpqNkgjb2SJS+1vyPssZpboNdpm87KJzYAg9e7V5MbxB/vTrtzOZGlNXDD1vtb0ccCSb+reG6dxA== 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=uMPatnnUQXHgD41Ks+lYOhCFaua62ymlbssx9Frc+i0=; b=OUInLjhcz0qNyBEghGDoNwbywu9vreTkJZRf+nRNrQmebssc0qJBLUGVrg3GBRHixBHIeGzQV/y4qegUR7MzBLiWERJhd44sIpscYk80B4jd4gtWC3/vrRKbCYOE+q1Du5FqizVGhKNppfjRfZ5/m8BpWKoCgAG/KSgAQPCcpMU= Received: from CH2PR02CA0015.namprd02.prod.outlook.com (2603:10b6:610:4e::25) by BN6PR02MB2882.namprd02.prod.outlook.com (2603:10b6:404:ff::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2559.14; Fri, 20 Dec 2019 08:57:17 +0000 Received: from SN1NAM02FT009.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::207) by CH2PR02CA0015.outlook.office365.com (2603:10b6:610:4e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.18 via Frontend Transport; Fri, 20 Dec 2019 08:57:17 +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 SN1NAM02FT009.mail.protection.outlook.com (10.152.73.32) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2559.14 via Frontend Transport; Fri, 20 Dec 2019 08:57:16 +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 1iiE5y-0003Dl-Uk; Fri, 20 Dec 2019 00:57:14 -0800 Received: from [127.0.0.1] (helo=xsj-smtp-dlp1.xlnx.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1iiE5s-000105-7P; Fri, 20 Dec 2019 00:57:08 -0800 Received: from xsj-pvapsmtp01 (smtp-fallback.xilinx.com [149.199.38.66] (may be forged)) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id xBK8v79K029827; Fri, 20 Dec 2019 00:57:07 -0800 Received: from [10.140.184.180] (helo=xhdpunnaia40.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1iiE5q-0000zh-R5; Fri, 20 Dec 2019 00:57:07 -0800 Received: by xhdpunnaia40.localdomain (Postfix, from userid 13245) id 0EB72103F2B; Fri, 20 Dec 2019 14:27:06 +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 v2 1/3] net: emaclite: Fix coding style Date: Fri, 20 Dec 2019 14:26:58 +0530 Message-Id: <1576832220-9631-2-git-send-email-radhey.shyam.pandey@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576832220-9631-1-git-send-email-radhey.shyam.pandey@xilinx.com> References: <1576832220-9631-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.931-7.0-31-1 X-imss-scan-details: No--2.931-7.0-31-1;No--2.931-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)(136003)(346002)(39860400002)(376002)(428003)(249900001)(199004)(189003)(70586007)(70206006)(26005)(42882007)(4326008)(336012)(498600001)(316002)(8936002)(450100002)(36756003)(5660300002)(6666004)(356004)(107886003)(8676002)(2906002)(6266002)(6636002)(42186006)(81166006)(81156014)(2616005)(42866002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB2882; 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: 09b2bb79-24fc-408a-9420-08d7852a9d5f X-MS-TrafficTypeDiagnostic: BN6PR02MB2882: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 025796F161 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Oa8lmDdShs18QfJqJYHOuCEDl7xB6P1Mq/ZGg9TUjHDnP6CJp6jdeBa67b+LIEcVzjM9BOIeE0Q1iiswWgUB37YPIQ+2ZdwLMU5z7O9d3e0H6NtzITsJ9NGlRjshT0ZVplmYRn2qetWJ4g4M3QDdG3bgqOVZ/vCaAVuso1BPIR2EDlDv0DYHEHuMYSHCne2yu86qJlxHsNC6UWuDGta1mc4ntLyje2g8Ny3j+0Oy+oFeiabjmqK/9pXyNy4CKm4/1sDGHbLRoyO/9oiP7+OM2A/ylcRJFX7Q1fojkUV9nYmmYMLPAUq5+PZgeg1XuivWvOvKf6IIjh6QMaI+kOrdfNCceY6kYcUD6G1GcrIXrhxWUIqi45lu5470jP+Ymdt5+hw+PLZcAo6PVVJ8naOCW6MTAolBwYNjpST2TN9vvb4T0rTmSuqlhKCxMK0l+fxOcVjQofDGdaf/mT2dwd3YAByUakFZE9uXizLp/DMOdPH5QK2RWUEZK5dJqqQiUeN2 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2019 08:57:16.9800 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09b2bb79-24fc-408a-9420-08d7852a9d5f 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: BN6PR02MB2882 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 --- Changes for v2: Modified description of reset_lock spinlock variable. --- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 37 ++++++++++++--------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 0c26f5b..7f98728 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 @@ -115,7 +112,7 @@ * @next_tx_buf_to_use: next Tx buffer to write to * @next_rx_buf_to_use: next Rx buffer to read from * @base_addr: base address of the Emaclite device - * @reset_lock: lock used for synchronization + * @reset_lock: lock to serialize xmit and tx_timeout execution * @deferred_skb: holds an skb (for transmission at a later time) when the * Tx buffer is not free * @phy_dev: pointer to the PHY device @@ -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; /* serialize xmit and tx_timeout execution */ 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 Fri Dec 20 08:56:59 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: 1213973 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="dsW7C+sc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47fN0z1YjGz9sP3 for ; Fri, 20 Dec 2019 19:57:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727425AbfLTI5V (ORCPT ); Fri, 20 Dec 2019 03:57:21 -0500 Received: from mail-eopbgr680070.outbound.protection.outlook.com ([40.107.68.70]:45125 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727174AbfLTI5V (ORCPT ); Fri, 20 Dec 2019 03:57:21 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jDX6K1HoP8SLVWJ7SlxR/dJ/XqhZo0WeiWB9KNGpTp4GjxL/HdRgPB0GpmP5rSkU0cRE3LjRdflAa7xdGWpKou6q35vrn8Jr7HNpEITasojKr6kK5LrgyjGK8L1UTkkTFc46acCzpKLb6a1pj2pIXItwJlonTpwLWGEHFZ4rXjltcZE/XOgAfTxtoz9M478roe2dgSfK4OzJXpkxUW6GU4KUMuBd4gn/xCRRU3LDLRuvN5hfXewQLCs6j+EwGJb3LGXO8MG8ax4LIeeSqqjtj7/JjQI6NYSsZo7Mn9l4DOGJbEJs+wP1igZFtK8cMo5QydygloavYTcisXOKw7Q7Kw== 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=0uxBbx83RvrSIuPY8exWKLuimI6bnWdhUTj0clOivoA=; b=iqEM4jMcr3lPH8XnyJ5mOPGp3B/anYD3e4mZSceNrqIoKaIr3h3G7LU0GQKBtBQIWijhxRwJs8ji6Zd/gNytT/C6tpVX0dct8iJ22sMGnsqVpGggbYEeT1nOBXdefLMUU1gUHWp5u/h/88+LWsXZjPSd7vmPWyYZRsdIuXm0Y+WhuA7nlWpXfa6XQsLDlih7whEk18taGsU956nWAkRWDnf5L+UEV5cZEB6WxItUtXoZWcxFitvbmUZadlSNJIvedwFdy2Y6+zwv16Z8k6IMvXb2QYGQ8G86jyly3DTTn84nE79qk5Ss6+Y64oCffzQwYSnlCkEa8hTrKNfjv7tA8w== 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=0uxBbx83RvrSIuPY8exWKLuimI6bnWdhUTj0clOivoA=; b=dsW7C+sczTT4NY56j8PloYnSIfxkuR/bIENLWq04sDHQ3cykqO7o00ueOb5pw+gytuBcXh92fimwzxVZhVZJRsp6/2EJChiVAoHMMmRH8/O/OE2TaDaQ1r1Dc3uOpSVbc8K/8qsBYMtpvPuZLyeVeBK+OTUmKks/aZD3dbkXC14= Received: from BL0PR02CA0016.namprd02.prod.outlook.com (2603:10b6:207:3c::29) by DM6PR02MB4684.namprd02.prod.outlook.com (2603:10b6:5:fe::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2559.16; Fri, 20 Dec 2019 08:57:16 +0000 Received: from BL2NAM02FT033.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::208) by BL0PR02CA0016.outlook.office365.com (2603:10b6:207:3c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2559.15 via Frontend Transport; Fri, 20 Dec 2019 08:57:16 +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 BL2NAM02FT033.mail.protection.outlook.com (10.152.77.163) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2559.14 via Frontend Transport; Fri, 20 Dec 2019 08:57:16 +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 1iiE5y-0003Dk-4M; Fri, 20 Dec 2019 00:57:14 -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 1iiE5s-000101-Ej; Fri, 20 Dec 2019 00:57:08 -0800 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id xBK8v7Uv010842; Fri, 20 Dec 2019 00:57:07 -0800 Received: from [10.140.184.180] (helo=xhdpunnaia40.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1iiE5q-0000zi-RW; Fri, 20 Dec 2019 00:57:07 -0800 Received: by xhdpunnaia40.localdomain (Postfix, from userid 13245) id 1141C1053CF; Fri, 20 Dec 2019 14:27:06 +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 v2 2/3] net: emaclite: In kconfig remove arch dependency Date: Fri, 20 Dec 2019 14:26:59 +0530 Message-Id: <1576832220-9631-3-git-send-email-radhey.shyam.pandey@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576832220-9631-1-git-send-email-radhey.shyam.pandey@xilinx.com> References: <1576832220-9631-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)(39860400002)(376002)(136003)(396003)(346002)(428003)(249900001)(199004)(189003)(42186006)(356004)(6666004)(42882007)(336012)(36756003)(26005)(316002)(4744005)(6636002)(8676002)(81156014)(8936002)(81166006)(498600001)(2906002)(4326008)(5660300002)(107886003)(6266002)(70206006)(70586007)(450100002)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR02MB4684; 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: 08d7b073-d432-410a-f915-08d7852a9cca X-MS-TrafficTypeDiagnostic: DM6PR02MB4684: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 025796F161 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HWZvVIc/6LDs4zFWEXouw4fXmt/FNlX9aAxaoE/oysCqsxwPoGA1nqOtFEL3aS32Jca49Y3e8728LVIU7uIjQGVBXBfauBkZHVE5vnckV3iOVIZLWPgX8L6Xvvq0awkl4dlYkf8OPNdETk0Ea6zdi7zi0z7Ud+WSkeikUHpRs2Cdms99V0HlkDOgyQhv893AZKDR7v7Zpr/0QBIeFA7seUK92K1clioJKhPoQWVOoPsr8XvjlTWnjZ9w38w9P+okL3kF9Q/YbbLYTsMjx/6/TdnGoqH080hJ95lLH4jadCUlFfi5XxGPzN5WV6Ud3Q+vJLzG4TClsGYvwelXX4Pd+VQ3V1Lk82jLjpGNwCurTKYsUUJWHCnmDoRiBybxD1qhy3FoplwDZyfAsifmT+zLtqXYGEXxFSItky6T466F+hN+YMAXB+Dsc+zhlDeVcGC1 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2019 08:57:16.0151 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08d7b073-d432-410a-f915-08d7852a9cca 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: DM6PR02MB4684 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 Reported-by: kbuild test robot --- Changes for v2: None --- 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 Fri Dec 20 08:57:00 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: 1213974 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="HM3fnH0h"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47fN100pXjz9sPc for ; Fri, 20 Dec 2019 19:57:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727442AbfLTI5X (ORCPT ); Fri, 20 Dec 2019 03:57:23 -0500 Received: from mail-mw2nam12on2083.outbound.protection.outlook.com ([40.107.244.83]:6231 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727169AbfLTI5W (ORCPT ); Fri, 20 Dec 2019 03:57:22 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xpns2UgxfUKxRXaHRLf/i45YVXsNVW08vSNDEvi95DnAbMqxRVdFGSADI5FhO9xQP3A2JZj+93+IRKhgWL8kjBtcNmx3FCY594MrXEatpOkWr1bkC/UXln4ETm6q5nAoGReo9LbUTPsObK9F73Hez+GWXGDJatrWEp2mKgW4B+0Fmwgx2JfLOVrSrUuB/ft8oAtL9rJAnNbw0Afcld8L9IU8pQn88Jdt47BvTS1wc2CcQmZ7c6syg/tD3ZY7tkmBfaVQkXjrhk8W1zWu7yHShOmkUS9K9x/M7QNi0wie6DUgsVM/IFof7Pku1CZakAHM7e+6bZ1213uG47xGdxKgCQ== 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=Lig4wAPT9grsjl6xgWuOpn8bXgCbztF7LAQFrekMqiQ=; b=SvckeVozOXkZUoyLgN3p8psJ8MYcmOfzZOD0CdliZGPxYnLKKQoytt/IaPH0bGDGw31aNHm8Ak6Hp6Z1iGzv4Sj2yABhfICVWQiEu97MfUDCEL2RBW9j99He2g1t1f27oPge3W3iKEI5vXdflsbR3m75x/ktq091RjNkDhsqwgV+k4GnXFVZlmnsKfu/ChTo8NXCY5w3KgWVO7KFtAm1x3MvM2fHMl8vKW9+jGt46rOPVbYWXZb9f/O+3q+gLj7WkVGP60IwQc1edmhZj5FDsORf0Fyr/oJEWvzt/9NqBpCVa1W9J42B9PMSQhM0VRzW/BqjjRxtaIYni8q3XkjS5w== 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=Lig4wAPT9grsjl6xgWuOpn8bXgCbztF7LAQFrekMqiQ=; b=HM3fnH0hV/MBOrGpFDPzD0Pp/exc6Tf7SW+wFHoRYz9P4ENhUUroDCNy6J3lodsexD2ndI+TLBkjVw+Rc8NTByfhZMsu4sATDllqC05+OgJRuHnjetQquBxk81J3sQT20G8JSK9/VXExpYibLdhNCycP4gXNWBSLghemjkEeer8= Received: from DM6PR02CA0099.namprd02.prod.outlook.com (2603:10b6:5:1f4::40) by DM6PR02MB5449.namprd02.prod.outlook.com (2603:10b6:5:7a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2559.14; Fri, 20 Dec 2019 08:57:16 +0000 Received: from SN1NAM02FT037.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::208) by DM6PR02CA0099.outlook.office365.com (2603:10b6:5:1f4::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2559.15 via Frontend Transport; Fri, 20 Dec 2019 08:57:16 +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 SN1NAM02FT037.mail.protection.outlook.com (10.152.72.89) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2559.14 via Frontend Transport; Fri, 20 Dec 2019 08:57:15 +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 1iiE5x-0003Dj-Ts; Fri, 20 Dec 2019 00:57:13 -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 1iiE5s-000102-8b; Fri, 20 Dec 2019 00:57:08 -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 xBK8v7fo010844; Fri, 20 Dec 2019 00:57:07 -0800 Received: from [10.140.184.180] (helo=xhdpunnaia40.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1iiE5q-0000zj-SZ; Fri, 20 Dec 2019 00:57:07 -0800 Received: by xhdpunnaia40.localdomain (Postfix, from userid 13245) id 1A4A91053D0; Fri, 20 Dec 2019 14:27:06 +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 v2 3/3] net: emaclite: Fix arm64 compilation warnings Date: Fri, 20 Dec 2019 14:27:00 +0530 Message-Id: <1576832220-9631-4-git-send-email-radhey.shyam.pandey@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576832220-9631-1-git-send-email-radhey.shyam.pandey@xilinx.com> References: <1576832220-9631-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)(39860400002)(346002)(376002)(396003)(136003)(428003)(249900001)(199004)(189003)(6636002)(6266002)(107886003)(70206006)(70586007)(42186006)(316002)(36756003)(5660300002)(2616005)(42882007)(336012)(8676002)(81156014)(6666004)(8936002)(2906002)(356004)(450100002)(4326008)(26005)(498600001)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR02MB5449; 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: f203fc20-d603-4287-1fdf-08d7852a9cab X-MS-TrafficTypeDiagnostic: DM6PR02MB5449: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:167; X-Forefront-PRVS: 025796F161 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: StXt8q5Qev4cd9/oe69Qea+HqomDwJxkgOZJoadztCgsWY63xnuyZc4GSMVEQzYYLuzTHiRHBakd4OklCEg9OWRKC6acgG3ykOxeiAZakZaEteXFdsVAjoCeMywCzJR2ZzEsLNDJFDb0aXJYTuDdf+giDu3vflRce94OFlUG2lCBPZ4ukuDxqI7Fhl7vKMCezK6JHkxKJ3gVUWyuDxCNauZnuOuW3AeueIbGXBLkQO3npBznMfVFgG3h2aZ4gRAsWY+TrA+PRpYy0CG+huK0AHKykY3AbSw53SQqtr3WSai+Gme4JLMJlmTcTu/0VcCxzXvd4TPNCwBlh+Y9uEkGqB64+LfeJywV6UKu8/PB9G3sW21fvX9AJrBg3f0Xcaib7SqNVkrY2iK0m24Ww6GwZFT/GoaU+6dmqg3B7NVqwtqnaxYgp/msN7dQlk+ATtTT X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2019 08:57:15.8304 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f203fc20-d603-4287-1fdf-08d7852a9cab 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: DM6PR02MB5449 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 --- Changes for v2: None --- 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 7f98728..96e9d21 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: