From patchwork Thu Jan 21 08:46:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 8079301 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 96463BEEE5 for ; Thu, 21 Jan 2016 08:46:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB38620585 for ; Thu, 21 Jan 2016 08:46:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B8E1A20567 for ; Thu, 21 Jan 2016 08:46:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758982AbcAUIqY (ORCPT ); Thu, 21 Jan 2016 03:46:24 -0500 Received: from mx2.suse.de ([195.135.220.15]:51055 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751528AbcAUIqW (ORCPT ); Thu, 21 Jan 2016 03:46:22 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DE822AAB2; Thu, 21 Jan 2016 08:46:17 +0000 (UTC) Date: Thu, 21 Jan 2016 09:46:12 +0100 From: Jean Delvare To: linux-omap@vger.kernel.org, linux-serial@vger.kernel.org Cc: Tony Lindgren , Jiri Slaby , Greg Kroah-Hartman Subject: [PATCH] ARM: OMAP: serial: Rename DRIVER_NAME Message-ID: <20160121094612.7bc6e979@endymion.delvare> Organization: SUSE Linux X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.23; x86_64-suse-linux-gnu) MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP DRIVER_NAME is too generic to be used in a driver-specific platform data file. Use a name specific to the driver instead, to avoid collisions. Signed-off-by: Jean Delvare Cc: Tony Lindgren Cc: Jiri Slaby Cc: Greg Kroah-Hartman Acked-by: Tony Lindgren --- arch/arm/mach-omap2/serial.c | 2 +- drivers/tty/serial/omap-serial.c | 2 +- include/linux/platform_data/serial-omap.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- linux-4.5-rc0.orig/arch/arm/mach-omap2/serial.c 2016-01-11 00:01:32.000000000 +0100 +++ linux-4.5-rc0/arch/arm/mach-omap2/serial.c 2016-01-21 09:23:49.430678093 +0100 @@ -252,7 +252,7 @@ void __init omap_serial_init_port(struct info = omap_serial_default_info; oh = uart->oh; - name = DRIVER_NAME; + name = OMAP_SERIAL_DRIVER_NAME; omap_up.dma_enabled = info->dma_enabled; omap_up.uartclk = OMAP24XX_BASE_BAUD * 16; --- linux-4.5-rc0.orig/drivers/tty/serial/omap-serial.c 2016-01-20 09:24:58.828571934 +0100 +++ linux-4.5-rc0/drivers/tty/serial/omap-serial.c 2016-01-21 09:24:04.590018356 +0100 @@ -1866,7 +1866,7 @@ static struct platform_driver serial_oma .probe = serial_omap_probe, .remove = serial_omap_remove, .driver = { - .name = DRIVER_NAME, + .name = OMAP_SERIAL_DRIVER_NAME, .pm = &serial_omap_dev_pm_ops, .of_match_table = of_match_ptr(omap_serial_of_match), }, --- linux-4.5-rc0.orig/include/linux/platform_data/serial-omap.h 2016-01-11 00:01:32.000000000 +0100 +++ linux-4.5-rc0/include/linux/platform_data/serial-omap.h 2016-01-21 09:23:32.692302387 +0100 @@ -21,7 +21,7 @@ #include #include -#define DRIVER_NAME "omap_uart" +#define OMAP_SERIAL_DRIVER_NAME "omap_uart" /* * Use tty device name as ttyO, [O -> OMAP]