diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-06 15:08:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-06 15:08:56 +0100 |
| commit | b9194ff1f165e9264d07cdb6853161d7bcc6c3c6 (patch) | |
| tree | 78820a7093efbb83548ef765acac071d45cc7be7 | |
| parent | 5da1e63803853102fd2ed6d04ac121955e9ea51b (diff) | |
| parent | 1a4920940ebfd8d907858abd8f8dd09b13752946 (diff) | |
| download | linux-next-b9194ff1f165e9264d07cdb6853161d7bcc6c3c6.tar.gz linux-next-b9194ff1f165e9264d07cdb6853161d7bcc6c3c6.zip | |
Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git
| -rw-r--r-- | drivers/pwm/pwm-adp5585.c | 4 | ||||
| -rw-r--r-- | drivers/pwm/pwm-mc33xs2410.c | 2 | ||||
| -rw-r--r-- | drivers/pwm/pwm-pxa.c | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/pwm/pwm-adp5585.c b/drivers/pwm/pwm-adp5585.c index 0644ff40f0fb..9a1dbba75bc1 100644 --- a/drivers/pwm/pwm-adp5585.c +++ b/drivers/pwm/pwm-adp5585.c @@ -202,8 +202,8 @@ static const struct adp5585_pwm_chip adp5589_pwm_chip_info = { }; static const struct platform_device_id adp5585_pwm_id_table[] = { - { "adp5585-pwm", (kernel_ulong_t)&adp5585_pwm_chip_info }, - { "adp5589-pwm", (kernel_ulong_t)&adp5589_pwm_chip_info }, + { .name = "adp5585-pwm", .driver_data = (kernel_ulong_t)&adp5585_pwm_chip_info }, + { .name = "adp5589-pwm", .driver_data = (kernel_ulong_t)&adp5589_pwm_chip_info }, { /* Sentinel */ } }; MODULE_DEVICE_TABLE(platform, adp5585_pwm_id_table); diff --git a/drivers/pwm/pwm-mc33xs2410.c b/drivers/pwm/pwm-mc33xs2410.c index 6d99e3ff7239..9f89b60dda78 100644 --- a/drivers/pwm/pwm-mc33xs2410.c +++ b/drivers/pwm/pwm-mc33xs2410.c @@ -381,7 +381,7 @@ static int mc33xs2410_probe(struct spi_device *spi) } static const struct spi_device_id mc33xs2410_spi_id[] = { - { "mc33xs2410" }, + { .name = "mc33xs2410" }, { } }; MODULE_DEVICE_TABLE(spi, mc33xs2410_spi_id); diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index 156c0c74cd80..c206dbe9000e 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -31,12 +31,12 @@ #define HAS_SECONDARY_PWM 0x10 static const struct platform_device_id pwm_id_table[] = { - /* PWM has_secondary_pwm? */ - { "pxa25x-pwm", 0 }, - { "pxa27x-pwm", HAS_SECONDARY_PWM }, - { "pxa168-pwm", 0 }, - { "pxa910-pwm", 0 }, - { }, + /* PWM has_secondary_pwm? */ + { .name = "pxa25x-pwm", .driver_data = 0 }, + { .name = "pxa27x-pwm", .driver_data = HAS_SECONDARY_PWM }, + { .name = "pxa168-pwm", .driver_data = 0 }, + { .name = "pxa910-pwm", .driver_data = 0 }, + { } }; MODULE_DEVICE_TABLE(platform, pwm_id_table); |