From patchwork Thu Jan 18 21:02:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125051 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp298015lja; Thu, 18 Jan 2018 13:08:24 -0800 (PST) X-Google-Smtp-Source: ACJfBou50kZPkzk9kokPNWZk3XVIE1pcI4/xjLU2CdxgjLcsKuiC4WOQvKuHC53xwwLjut8pBwGM X-Received: by 10.99.153.17 with SMTP id d17mr39270053pge.30.1516309704346; Thu, 18 Jan 2018 13:08:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309704; cv=none; d=google.com; s=arc-20160816; b=GU2hic4Sn5Q0hefaO6YBhKfDkGN53AX/WPnPLwi3/1mgXfDIAkqnUxqOrIfNIlaHe7 Mbea+Lii4L7Jn6qoC51ghVz3G7JwKJp2G7/GjLmWF7tzTIYR79FlZOb0RhWyy9Tp96OZ gvQzQKqQYbHd7J72TvJk5rI74M4eY/CZYfvv4hu6k/fQ9v+3nLSogy4AkYVuPgydN4v3 y9m1ZUZVNO4bhnAYLSyi0LAFb+Bxq+T1GwWBlhbSM0fG8kuBb3TUIWS82kPc/La3iFwh XAU9cPyNXm6NebnKxDtz5xORFc6/Yzm6WXPGOjYYaOX+2h3XR34WcZyJFc3Oi1hrXnZw xGvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=C/fHEqaCC+ddbvfaUnCeQ9HGKiFMUw14PhMhJjo73SI=; b=uZkfozwOKtceqXcACaV1Lv5vHJXZ2gvTTi0brw7KiF8hZnBDpMO+0iccb7K6/ywFRh sj0RHBlL+bjCCci8kPjfp540AnJX6k8X8cEKyfYRhQz6WbGhbCGOIAvB8+hlyLLNxeU0 4LXuS5/v16+Lh6AN37BR0k35O4JiXj4OgVMQFmCOi35QogSoq4M7lm6CZWEcojy7ImUT FqQpKL/fQNSdfmCQqfwNZsNyAkAqwr33XQedqUyHhGSS/93SDYEFCmO4H7t04za4q4H4 Neiy5JeqrZu+8n7IZ/9is0IDYi6Sw3XgWvi5LtBDAPq0ZlED5jZlod/e2M1wK3D0sr+4 EMEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=RrmySCiE; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i1si6559673pgq.829.2018.01.18.13.08.23; Thu, 18 Jan 2018 13:08:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=RrmySCiE; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753142AbeARVIW (ORCPT + 10 others); Thu, 18 Jan 2018 16:08:22 -0500 Received: from mail-dm3nam03on0112.outbound.protection.outlook.com ([104.47.41.112]:17872 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932798AbeARVHd (ORCPT ); Thu, 18 Jan 2018 16:07:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=C/fHEqaCC+ddbvfaUnCeQ9HGKiFMUw14PhMhJjo73SI=; b=RrmySCiESD8e8HJ+H7YbZRGua0OYCNCKPpInYBHYyot5EApBtD7KAMVmxhnvCyGpjpdwJC1yD/iQXeU6DjHPUlMdLKEdAW+4oTy01KYjeCwVqpL5UxHgZzi8e4OAeF6VZYLiublEJNajk5F8LvAcnsP9J2aiwX6QHdbKiK7S08o= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0885.namprd21.prod.outlook.com (52.132.132.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.428.9; Thu, 18 Jan 2018 21:07:10 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 21:07:10 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Russell King , Sasha Levin Subject: [added to the 4.1 stable tree] ARM: 8584/1: floppy: avoid gcc-6 warning Thread-Topic: [added to the 4.1 stable tree] ARM: 8584/1: floppy: avoid gcc-6 warning Thread-Index: AQHTkJ+X4vR207MqckGOit0kqm4pKA== Date: Thu, 18 Jan 2018 21:02:03 +0000 Message-ID: <20180118205908.3220-296-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.60.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0885; 6:QtZ1ZUlXu3+JbWo01fyD+036MMGxKZloWSzECsmkIRHyBbIqDS1b47i5Ns1eUNIV7kKv5MyGBMU18pW74gSUU/5XatlVArt7b4x6xOvgAOfv8L6JorUbm1NDgeAMUqUukj7clFVbvIOaEWKgTMUSIZzEId9JrfNf6MVpcgv0dBgCq5cDorEsLVHM64e1mAM4prt/YL5f8U1T7WnhjyF+QaRn684AKs+qWjg+uxFq8OTZV5SSWH12kiJ1L2MIYK+2pb3Jq3YfjxscpHzyUJXijgYsV7OL2tCUOdZbMhiEmM/dY99HYlR3T7lplpt7AoF3bpZ1zT2vkflkB6Y5UzcNL636kc/2xvnmiwD+HOhhGB9lmVw9EK6i7I9ikTS2Y5nh; 5:N6iKL9kWROGoRtZ9ktdd5p08N5/OUwZWos3FYESZSU7KxXt6mkQLGl9Vni9Bm4K9NyMrNVqwWOocqJd/6xPmDRp/rzmhik5EBCv5QwHZf2isLPVSJkunuRTJAQ09Gcp1Qpl/fKPFQk28PBrdtXy0+kr10gL+cDgPGVwA6clphWg=; 24:tQFEvh3wwDtd86IVGfYziALIM+VkRpl+Z8HVH8flNQZGkV1+kWkrvLdalubVsraF1kfIZwv4xx/9IVtzqJ4lb/3REEBRuODDPnoSv4jtybs=; 7:yRHRb5I4yc5OtPhKYgvBRQvE+X5yvjC3kyDMmy96u29aQ1PvmMmbXY9pJf1ohbirXR3uwei0KCnRFMhrVacxSBrP+QPtX0jLCOS+50cTEDLQigjmTbCVeOIcpOQBSBE7IhfojYLr8GhCeglyjgLRzf1AzEPlmjjADsYc9aO3JQcGtDQgCdZdf+ZAct82TRK1nuSblIXUR+BCYl27X5fhNY4T/k+phTM02SQOD1y6uXtpwjfcB+otGSdiKtCpKQXJ x-ms-office365-filtering-correlation-id: ea76e885-fbb5-4c7b-9347-08d55eb770b7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB0885; x-ms-traffictypediagnostic: DM5PR2101MB0885: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231046)(2400067)(944501161)(6055026)(61426038)(61427038)(6041282)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0885; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB0885; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(346002)(39860400002)(39380400002)(376002)(366004)(199004)(189003)(316002)(76176011)(106356001)(8676002)(8936002)(3660700001)(6506007)(25786009)(105586002)(14454004)(68736007)(3280700002)(36756003)(2501003)(110136005)(54906003)(81166006)(81156014)(5250100002)(6486002)(26005)(305945005)(7736002)(478600001)(99286004)(102836004)(6666003)(2950100002)(59450400001)(66066001)(3846002)(10090500001)(22452003)(86612001)(2906002)(1076002)(10290500003)(5660300001)(6116002)(575784001)(86362001)(2900100001)(107886003)(6512007)(6436002)(97736004)(4326008)(53936002)(72206003)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0885; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: UgaFPAUPHsWJ12Je3DZzfZIJLbXLBQkxf8AfR/j1ri1tTAW/B7J7oC5gbz8LbGozJMlC2hNHccv9htMdO/Brjg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea76e885-fbb5-4c7b-9347-08d55eb770b7 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:02:03.3048 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0885 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit dd665be0e243873343a28e18f9f345927b658daf ] gcc-6.0 warns about comparisons between two identical expressions, which is what we get in the floppy driver when writing to the FD_DOR register: drivers/block/floppy.c: In function 'set_dor': drivers/block/floppy.c:810:44: error: self-comparison always evaluates to true [-Werror=tautological-compare] fd_outb(newdor, FD_DOR); It would be nice to use a static inline function instead of the macro, to avoid the warning, but we cannot do that because the FD_DOR definition is incomplete at this point. Adding a cast to (u32) is a harmless way to shut up the warning, just not very nice. Signed-off-by: Arnd Bergmann Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/include/asm/floppy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h index f4882553fbb0..85a34cc8316a 100644 --- a/arch/arm/include/asm/floppy.h +++ b/arch/arm/include/asm/floppy.h @@ -17,7 +17,7 @@ #define fd_outb(val,port) \ do { \ - if ((port) == FD_DOR) \ + if ((port) == (u32)FD_DOR) \ fd_setdor((val)); \ else \ outb((val),(port)); \