From patchwork Fri May 22 20:49:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Craig Magina X-Patchwork-Id: 475790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 4D478140E6D; Sat, 23 May 2015 06:49:46 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Yvtsx-0004bF-Nr; Fri, 22 May 2015 20:49:39 +0000 Received: from mail-qk0-f173.google.com ([209.85.220.173]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Yvtsq-0004aX-3q for kernel-team@lists.ubuntu.com; Fri, 22 May 2015 20:49:32 +0000 Received: by qkx62 with SMTP id 62so21633744qkx.3 for ; Fri, 22 May 2015 13:49:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=qZE/aicNC6aLEh9nJ3ApCyxN20M1NnrmX+XWbUmSsUg=; b=LX1gaaw1O43gKwsey/pa4V6tezh7fs8ifTK4pI8vxFSkViBjiRWI+t76JSi8cxHZD2 woHHzm/WbLFyOU9QmKW1uPIRSWpmJJIUYgawW0G0nHMAbwqPeYesnmrx6Al2xmgbAV26 3+fM5Q2BS0GZqcpiF/4cPgQg/+mntJpDD6zO4pNvCNvCExSoeHQJiACLTpmpEvWbM22i cJPBuRv9zDlQsLeQVAUGTdYgLy27XWSydHjEsHpL0NkIafHnQlgiTKJrw0HIZoKJcxVP FS+Hh1L7D1fyJZh8rgponlw97cNobZPVn7znL/kp2U5SOSj8d+qwzaOImbaqAHFpFC+7 pz5g== X-Gm-Message-State: ALoCoQmcc06opNh8WzivoHU9PvUwbXbpqaMMy1kgmbrCu8zfNJyaOunh88rIrK4GhIwy3TO17qEl X-Received: by 10.55.19.82 with SMTP id d79mr7533844qkh.21.1432327771684; Fri, 22 May 2015 13:49:31 -0700 (PDT) Received: from localhost.localdomain (c-76-19-154-191.hsd1.ma.comcast.net. [76.19.154.191]) by mx.google.com with ESMTPSA id 64sm2048120qkw.13.2015.05.22.13.49.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 May 2015 13:49:31 -0700 (PDT) From: Craig Magina To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/7] [trusty SRU] (upstream) drivers: net: xgene: constify of_device_id array Date: Fri, 22 May 2015 16:49:17 -0400 Message-Id: <1432327761-10496-4-git-send-email-craig.magina@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432327761-10496-1-git-send-email-craig.magina@canonical.com> References: <1432327761-10496-1-git-send-email-craig.magina@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Fabian Frederick of_device_id is always used as const. (See driver.of_match_table and open firmware functions) BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1458042 Signed-off-by: Fabian Frederick Signed-off-by: David S. Miller (cherry picked from commit a6b0dc2af494456b197048b75321a871e13dc398) Signed-off-by: Phong Vo Signed-off-by: Craig Magina Conflicts: drivers/net/ethernet/apm/xgene/xgene_enet_main.c --- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index a8a27b3..7e08a46 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -977,7 +977,7 @@ static int xgene_enet_remove(struct platform_device *pdev) return 0; } -static struct of_device_id xgene_enet_match[] = { +static const struct of_device_id xgene_enet_match[] = { {.compatible = "apm,xgene-enet",}, {.compatible = "apm,xgene1-sgenet",}, {.compatible = "apm,xgene1-xgenet",},