projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pwm/for-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[platform/kernel/linux-rpi.git]
/
drivers
/
pwm
/
pwm-pxa.c
diff --git
a/drivers/pwm/pwm-pxa.c
b/drivers/pwm/pwm-pxa.c
index
762429d
..
1e475ed
100644
(file)
--- a/
drivers/pwm/pwm-pxa.c
+++ b/
drivers/pwm/pwm-pxa.c
@@
-15,6
+15,7
@@
* input clock (PWMCR_SD is set) and the output is driven to inactive.
*/
* input clock (PWMCR_SD is set) and the output is driven to inactive.
*/
+#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
@@
-156,13
+157,6
@@
MODULE_DEVICE_TABLE(of, pwm_of_match);
#define pwm_of_match NULL
#endif
#define pwm_of_match NULL
#endif
-static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev)
-{
- const struct of_device_id *id = of_match_device(pwm_of_match, dev);
-
- return id ? id->data : NULL;
-}
-
static int pwm_probe(struct platform_device *pdev)
{
const struct platform_device_id *id = platform_get_device_id(pdev);
static int pwm_probe(struct platform_device *pdev)
{
const struct platform_device_id *id = platform_get_device_id(pdev);
@@
-170,7
+164,7
@@
static int pwm_probe(struct platform_device *pdev)
int ret = 0;
if (IS_ENABLED(CONFIG_OF) && id == NULL)
int ret = 0;
if (IS_ENABLED(CONFIG_OF) && id == NULL)
- id =
pxa_pwm_get_id_dt
(&pdev->dev);
+ id =
of_device_get_match_data
(&pdev->dev);
if (id == NULL)
return -EINVAL;
if (id == NULL)
return -EINVAL;