Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3307239imu; Sun, 11 Nov 2018 12:03:38 -0800 (PST) X-Google-Smtp-Source: AJdET5cqMLGi7f9d3BWaytdY+tRnSZNyu/Y6ye4SPwJWFJGUu9WqOavZDIVJZhA1Gy4qiJFzE3wd X-Received: by 2002:a63:680a:: with SMTP id d10mr3930417pgc.396.1541966618405; Sun, 11 Nov 2018 12:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541966618; cv=none; d=google.com; s=arc-20160816; b=zmhTzAC7GJ+GxnNrAD7T7dYiVO1YIeNctEzhA7/66zjxPUpXYK42w3+77iwlgMcn5m //mCBNIo/Ki8lK9vwUPyLaUs/vPeHWYJhbiElC2poJml8fb5RvwxUtdpi9cPnZiOLY1E yPlcnkc4ZH6TjBtcfANYsKO4ojnFbelUiT9heuxF1y//NajW43+dwUb8RYs6tLh6iykl O5BHqt3EvgweKiotYwibT6WcBwH1YQGwsSooi12dlLJYhXIqkv+P9d/Rf1IuV7O5GlIh bCDBf8ALVWf+0vBtG2NVCBvpTqpgx2Jo+9buGoN/Oa45KnoHbkKNSD1vvBZQrZtDiFd3 8b/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=h4I9rHFTK8vCDw/MmauWJKoxS5ywQ8bcqy+IwPtI1RU=; b=mWYzOvHbyZvWqWlUI1njr7vd7cYAyeE5+DLK0mNbarHon28XL0g0QyI/+ftX0y6BNU VLhGzdPSzCGCejgJnZo1Qh/xWxBPhbC0bN7Vbz9XyLOr36/7/p/ZKvNVV48sDfiQxEpg VRO2hYS/JageKq31kV3ECojT7Vh6pqd4vXs37u2hSGbjefN0ZDTjY0Er7R5JqsS7x8CZ IFyJ8UoH0BeXpAQMvTWn3xPloQ0N9X1PE1LQdFCEmk/7hms6k3mJ9C4xrOXVBPeU+Xmu 6xnznJqDcXe3DIECT9rE7/xgB7bz9t5hEBTTZol8P8nQSbpawu7Naxn/3RA3a9bzIlHm CJiA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v1-v6si14802541plo.134.2018.11.11.12.03.22; Sun, 11 Nov 2018 12:03:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730822AbeKLFsd (ORCPT + 99 others); Mon, 12 Nov 2018 00:48:33 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:51062 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729606AbeKLFsa (ORCPT ); Mon, 12 Nov 2018 00:48:30 -0500 Received: from [192.168.4.242] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gLvso-0000lK-R9; Sun, 11 Nov 2018 19:58:59 +0000 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1gLvsX-0001lE-MW; Sun, 11 Nov 2018 19:58:41 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Fabian Frederick" , "David S. Miller" Date: Sun, 11 Nov 2018 19:49:05 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 278/366] can: constify of_device_id array In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.242 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.61-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Fabian Frederick commit 486e957033623656298a07c39a8bf2fd81db285b upstream. of_device_id is always used as const. (See driver.of_match_table and open firmware functions) Signed-off-by: Fabian Frederick Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- drivers/net/can/cc770/cc770_platform.c | 2 +- drivers/net/can/grcan.c | 2 +- drivers/net/can/mscan/mpc5xxx_can.c | 2 +- drivers/net/can/sja1000/sja1000_platform.c | 2 +- drivers/net/can/xilinx_can.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) --- a/drivers/net/can/cc770/cc770_platform.c +++ b/drivers/net/can/cc770/cc770_platform.c @@ -254,7 +254,7 @@ static int cc770_platform_remove(struct return 0; } -static struct of_device_id cc770_platform_table[] = { +static const struct of_device_id cc770_platform_table[] = { {.compatible = "bosch,cc770"}, /* CC770 from Bosch */ {.compatible = "intc,82527"}, /* AN82527 from Intel CP */ {}, --- a/drivers/net/can/grcan.c +++ b/drivers/net/can/grcan.c @@ -1725,7 +1725,7 @@ static int grcan_remove(struct platform_ return 0; } -static struct of_device_id grcan_match[] = { +static const struct of_device_id grcan_match[] = { {.name = "GAISLER_GRCAN"}, {.name = "01_03d"}, {.name = "GAISLER_GRHCAN"}, --- a/drivers/net/can/mscan/mpc5xxx_can.c +++ b/drivers/net/can/mscan/mpc5xxx_can.c @@ -43,7 +43,7 @@ struct mpc5xxx_can_data { }; #ifdef CONFIG_PPC_MPC52xx -static struct of_device_id mpc52xx_cdm_ids[] = { +static const struct of_device_id mpc52xx_cdm_ids[] = { { .compatible = "fsl,mpc5200-cdm", }, {} }; --- a/drivers/net/can/sja1000/sja1000_platform.c +++ b/drivers/net/can/sja1000/sja1000_platform.c @@ -242,7 +242,7 @@ static int sp_remove(struct platform_dev return 0; } -static struct of_device_id sp_of_table[] = { +static const struct of_device_id sp_of_table[] = { {.compatible = "nxp,sja1000"}, {}, }; --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -1184,7 +1184,7 @@ static int xcan_remove(struct platform_d } /* Match table for OF platform binding */ -static struct of_device_id xcan_of_match[] = { +static const struct of_device_id xcan_of_match[] = { { .compatible = "xlnx,zynq-can-1.0", }, { .compatible = "xlnx,axi-can-1.00.a", }, { /* end of list */ },