mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 23:22:31 +02:00
spi: Add empty versions of ACPI lookup functions
A patch from Richard Fitzgerald adding dummy versions of the ACPI lookup
functions for SPI:
Provide empty versions of acpi_spi_count_resources(),
acpi_spi_device_alloc() and acpi_spi_find_controller_by_adev()
if the real functions are not being built.
This commit fixes two problems with the original definitions:
1) There wasn't an empty version of these functions
2) The #if only depended on CONFIG_ACPI. But the functions are implemented
in the core spi.c so CONFIG_SPI_MASTER must also be enabled for the real
functions to exist.
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmaxKmgACgkQJNaLcl1U
h9DoTwf9FnURHsbLDugoWZlGnqMJoBzseQYCv2F45BoOLzBgIjDHZ80DUq0hgwGa
Igxxk1oMbQtqVHZnnVRhpytpC8F2jAS6tJ68xeBDmWgRFwhcFKyVYk1VLjjmbfSW
0zyxBXE7tiKet4FQpIBNNkk91FTMqnK0YWN1LoArbihrZ2x5YcdnFHc8CjV9PKi3
Y/xTL2sKOqmMNda/7oLYOWDfNXb2Gs3YAoLF+ERT+R+GKT2MGXqrRxVGx+D6ijJb
vPIxJMHWafzR5y+ysvG9wxVqxudAErvewpwP6KQmhPvhdqDolgoYwsFItdRc30Gf
g6xh5rzCFsEsjvII0rdutGzAdIfAJw==
=GsTT
-----END PGP SIGNATURE-----
Merge tag 'spi-acpi-lookup-dummy' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into topic/cirrus-hp-g12
spi: Add empty versions of ACPI lookup functions
A patch from Richard Fitzgerald adding dummy versions of the ACPI lookup
functions for SPI:
Provide empty versions of acpi_spi_count_resources(),
acpi_spi_device_alloc() and acpi_spi_find_controller_by_adev()
if the real functions are not being built.
This commit fixes two problems with the original definitions:
1) There wasn't an empty version of these functions
2) The #if only depended on CONFIG_ACPI. But the functions are implemented
in the core spi.c so CONFIG_SPI_MASTER must also be enabled for the real
functions to exist.
This commit is contained in:
commit
9219b179ba
|
|
@ -902,12 +902,29 @@ extern int devm_spi_register_controller(struct device *dev,
|
|||
struct spi_controller *ctlr);
|
||||
extern void spi_unregister_controller(struct spi_controller *ctlr);
|
||||
|
||||
#if IS_ENABLED(CONFIG_ACPI)
|
||||
#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SPI_MASTER)
|
||||
extern struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev);
|
||||
extern struct spi_device *acpi_spi_device_alloc(struct spi_controller *ctlr,
|
||||
struct acpi_device *adev,
|
||||
int index);
|
||||
int acpi_spi_count_resources(struct acpi_device *adev);
|
||||
#else
|
||||
static inline struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline struct spi_device *acpi_spi_device_alloc(struct spi_controller *ctlr,
|
||||
struct acpi_device *adev,
|
||||
int index)
|
||||
{
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
|
||||
static inline int acpi_spi_count_resources(struct acpi_device *adev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user