Commit 753a55f5 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: 8250_ni: Tidy up ACPI ID table 



Tidy up ACPI ID table:
- drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h et al.
- drop comma in the terminator entry

With that done, extend compile test coverage.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarChaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
Reviewed-by: default avatarChaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
Link: https://lore.kernel.org/r/20250321182119.454507-8-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 030df0ef

drivers/tty/serial/8250/8250_ni.c

+9 −6
Original line number Diff line number Diff line
@@ -10,14 +10,18 @@ 
 * Copyright 2012-2023 National Instruments Corporation

 */



#include <linux/acpi.h>

#include <linux/bitfield.h>

#include <linux/bits.h>

#include <linux/clk.h>

#include <linux/device.h>

#include <linux/io.h>

#include <linux/init.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/clk.h>

#include <linux/serial_core.h>

#include <linux/types.h>



#include "8250.h"
@@ -392,7 +396,6 @@ static void ni16550_remove(struct platform_device *pdev) 
	serial8250_unregister_port(data->line);

}



#ifdef CONFIG_ACPI

/* NI 16550 RS-485 Interface */

static const struct ni16550_device_info nic7750 = {

	.uartclk = 33333333,
@@ -417,20 +420,20 @@ static const struct ni16550_device_info nic7a69 = { 
	.uartclk = 29629629,

	.prescaler = 0x09,

};



static const struct acpi_device_id ni16550_acpi_match[] = {

	{ "NIC7750",	(kernel_ulong_t)&nic7750 },

	{ "NIC7772",	(kernel_ulong_t)&nic7772 },

	{ "NIC792B",	(kernel_ulong_t)&nic792b },

	{ "NIC7A69",	(kernel_ulong_t)&nic7a69 },

	{ },

	{ }

};

MODULE_DEVICE_TABLE(acpi, ni16550_acpi_match);

#endif



static struct platform_driver ni16550_driver = {

	.driver = {

		.name = "ni16550",

		.acpi_match_table = ACPI_PTR(ni16550_acpi_match),

		.acpi_match_table = ni16550_acpi_match,

	},

	.probe = ni16550_probe,

	.remove = ni16550_remove,

drivers/tty/serial/8250/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ config SERIAL_8250_BCM7271 
config SERIAL_8250_NI

	tristate "NI 16550 based serial port"

	depends on SERIAL_8250

	depends on (X86 && ACPI) || COMPILE_TEST

	depends on X86 || COMPILE_TEST

	help

	  This driver supports the integrated serial ports on National

	  Instruments (NI) controller hardware. This is required for all NI