mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 12:44:03 +02:00
nfc: Drop __maybe_unused from of_device_id tables
Referencing these arrays in MODULE_DEVICE_TABLE() is enough to convince
the compiler that they are used even if the drivers are built-in (since
5ab23c7923 ("modpost: Create modalias for builtin modules"). So the
__maybe_unused marking can be removed without introducing a compiler
warning.
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/031ea0ae38838df3261f844eb13e9841769b49a7.1783091699.git.u.kleine-koenig@baylibre.com
Signed-off-by: David Heidelberg <david@ixit.cz>
This commit is contained in:
parent
15aa65539a
commit
777fd2dab4
|
|
@ -245,7 +245,7 @@ static void nfcmrvl_i2c_remove(struct i2c_client *client)
|
|||
}
|
||||
|
||||
|
||||
static const struct of_device_id of_nfcmrvl_i2c_match[] __maybe_unused = {
|
||||
static const struct of_device_id of_nfcmrvl_i2c_match[] = {
|
||||
{ .compatible = "marvell,nfc-i2c", },
|
||||
{},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ static void nfcmrvl_spi_remove(struct spi_device *spi)
|
|||
nfcmrvl_nci_unregister_dev(drv_data->priv);
|
||||
}
|
||||
|
||||
static const struct of_device_id of_nfcmrvl_spi_match[] __maybe_unused = {
|
||||
static const struct of_device_id of_nfcmrvl_spi_match[] = {
|
||||
{ .compatible = "marvell,nfc-spi", },
|
||||
{},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ static void pn533_i2c_remove(struct i2c_client *client)
|
|||
pn53x_common_clean(phy->priv);
|
||||
}
|
||||
|
||||
static const struct of_device_id of_pn533_i2c_match[] __maybe_unused = {
|
||||
static const struct of_device_id of_pn533_i2c_match[] = {
|
||||
{ .compatible = "nxp,pn532", },
|
||||
/*
|
||||
* NOTE: The use of the compatibles with the trailing "...-i2c" is
|
||||
|
|
|
|||
|
|
@ -937,7 +937,7 @@ static void pn544_hci_i2c_remove(struct i2c_client *client)
|
|||
pn544_hci_i2c_disable(phy);
|
||||
}
|
||||
|
||||
static const struct of_device_id of_pn544_i2c_match[] __maybe_unused = {
|
||||
static const struct of_device_id of_pn544_i2c_match[] = {
|
||||
{ .compatible = "nxp,pn544-i2c", },
|
||||
{},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ static const struct i2c_device_id s3fwrn5_i2c_id_table[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(i2c, s3fwrn5_i2c_id_table);
|
||||
|
||||
static const struct of_device_id of_s3fwrn5_i2c_match[] __maybe_unused = {
|
||||
static const struct of_device_id of_s3fwrn5_i2c_match[] = {
|
||||
{ .compatible = "samsung,s3fwrn5-i2c", },
|
||||
{}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ static const struct acpi_device_id st_nci_i2c_acpi_match[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(acpi, st_nci_i2c_acpi_match);
|
||||
|
||||
static const struct of_device_id of_st_nci_i2c_match[] __maybe_unused = {
|
||||
static const struct of_device_id of_st_nci_i2c_match[] = {
|
||||
{ .compatible = "st,st21nfcb-i2c", },
|
||||
{ .compatible = "st,st21nfcb_i2c", },
|
||||
{ .compatible = "st,st21nfcc-i2c", },
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ static const struct acpi_device_id st_nci_spi_acpi_match[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(acpi, st_nci_spi_acpi_match);
|
||||
|
||||
static const struct of_device_id of_st_nci_spi_match[] __maybe_unused = {
|
||||
static const struct of_device_id of_st_nci_spi_match[] = {
|
||||
{ .compatible = "st,st21nfcb-spi", },
|
||||
{}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -583,7 +583,7 @@ static const struct acpi_device_id st21nfca_hci_i2c_acpi_match[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(acpi, st21nfca_hci_i2c_acpi_match);
|
||||
|
||||
static const struct of_device_id of_st21nfca_i2c_match[] __maybe_unused = {
|
||||
static const struct of_device_id of_st21nfca_i2c_match[] = {
|
||||
{ .compatible = "st,st21nfca-i2c", },
|
||||
{ .compatible = "st,st21nfca_i2c", },
|
||||
{}
|
||||
|
|
|
|||
|
|
@ -1054,7 +1054,7 @@ static const struct spi_device_id st95hf_id[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(spi, st95hf_id);
|
||||
|
||||
static const struct of_device_id st95hf_spi_of_match[] __maybe_unused = {
|
||||
static const struct of_device_id st95hf_spi_of_match[] = {
|
||||
{ .compatible = "st,st95hf" },
|
||||
{},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2303,7 +2303,7 @@ static const struct dev_pm_ops trf7970a_pm_ops = {
|
|||
trf7970a_pm_runtime_resume, NULL)
|
||||
};
|
||||
|
||||
static const struct of_device_id trf7970a_of_match[] __maybe_unused = {
|
||||
static const struct of_device_id trf7970a_of_match[] = {
|
||||
{.compatible = "ti,trf7970a",},
|
||||
{},
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user