Skip to content

Commit c6c3c57

Browse files
torvaldstorvalds
committed
Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH: "Here is the big set of driver core patches for 5.15-rc1. These do change a number of different things across different subsystems, and because of that, there were 2 stable tags created that might have already come into your tree from different pulls that did the following - changed the bus remove callback to return void - sysfs iomem_get_mapping rework Other than those two things, there's only a few small things in here: - kernfs performance improvements for huge numbers of sysfs users at once - tiny api cleanups - other minor changes All of these have been in linux-next for a while with no reported problems, other than the before-mentioned merge issue" * tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (33 commits) MAINTAINERS: Add dri-devel for component.[hc] driver core: platform: Remove platform_device_add_properties() ARM: tegra: paz00: Handle device properties with software node API bitmap: extend comment to bitmap_print_bitmask/list_to_buf drivers/base/node.c: use bin_attribute to break the size limitation of cpumap ABI topology: use bin_attribute to break the size limitation of cpumap ABI lib: test_bitmap: add bitmap_print_bitmask/list_to_buf test cases cpumask: introduce cpumap_print_list/bitmask_to_buf to support large bitmask and list sysfs: Rename struct bin_attribute member to f_mapping sysfs: Invoke iomem_get_mapping() from the sysfs open callback debugfs: Return error during {full/open}_proxy_open() on rmmod zorro: Drop useless (and hardly used) .driver member in struct zorro_dev zorro: Simplify remove callback sh: superhyway: Simplify check in remove callback nubus: Simplify check in remove callback nubus: Make struct nubus_driver::remove return void kernfs: dont call d_splice_alias() under kernfs node lock kernfs: use i_lock to protect concurrent inode updates kernfs: switch kernfs to use an rwsem kernfs: use VFS negative dentry caching ...
2 parents ba1dc7f + 049d169 commit c6c3c57

File tree

126 files changed

+729
-512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+729
-512
lines changed

‎MAINTAINERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5725,6 +5725,11 @@ F: Documentation/admin-guide/blockdev/
57255725
F: drivers/block/drbd/
57265726
F: lib/lru_cache.c
57275727

5728+
DRIVER COMPONENT FRAMEWORK
5729+
L: [email protected]
5730+
F: drivers/base/component.c
5731+
F: include/linux/component.h
5732+
57285733
DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
57295734
M: Greg Kroah-Hartman <[email protected]>
57305735
R: "Rafael J. Wysocki" <[email protected]>

‎arch/arm/common/locomo.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -834,14 +834,13 @@ static int locomo_bus_probe(struct device *dev)
834834
return ret;
835835
}
836836

837-
static int locomo_bus_remove(struct device *dev)
837+
static void locomo_bus_remove(struct device *dev)
838838
{
839839
struct locomo_dev *ldev = LOCOMO_DEV(dev);
840840
struct locomo_driver *drv = LOCOMO_DRV(dev->driver);
841841

842842
if (drv->remove)
843843
drv->remove(ldev);
844-
return 0;
845844
}
846845

847846
struct bus_type locomo_bus_type = {

‎arch/arm/common/sa1111.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,15 +1356,13 @@ static int sa1111_bus_probe(struct device *dev)
13561356
return ret;
13571357
}
13581358

1359-
static int sa1111_bus_remove(struct device *dev)
1359+
static void sa1111_bus_remove(struct device *dev)
13601360
{
13611361
struct sa1111_dev *sadev = to_sa1111_device(dev);
13621362
struct sa1111_driver *drv = SA1111_DRV(dev->driver);
13631363

13641364
if (drv->remove)
13651365
drv->remove(sadev);
1366-
1367-
return 0;
13681366
}
13691367

13701368
struct bus_type sa1111_bus_type = {

‎arch/arm/mach-rpc/ecard.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ static int ecard_drv_probe(struct device *dev)
10521052
return ret;
10531053
}
10541054

1055-
static int ecard_drv_remove(struct device *dev)
1055+
static void ecard_drv_remove(struct device *dev)
10561056
{
10571057
struct expansion_card *ec = ECARD_DEV(dev);
10581058
struct ecard_driver *drv = ECARD_DRV(dev->driver);
@@ -1067,8 +1067,6 @@ static int ecard_drv_remove(struct device *dev)
10671067
ec->ops = &ecard_default_ops;
10681068
barrier();
10691069
ec->irq_data = NULL;
1070-
1071-
return 0;
10721070
}
10731071

10741072
/*

‎arch/arm/mach-tegra/board-paz00.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static struct gpiod_lookup_table wifi_gpio_lookup = {
3636

3737
void __init tegra_paz00_wifikill_init(void)
3838
{
39-
platform_device_add_properties(&wifi_rfkill_device, wifi_rfkill_prop);
39+
device_create_managed_software_node(&wifi_rfkill_device.dev, wifi_rfkill_prop, NULL);
4040
gpiod_add_lookup_table(&wifi_gpio_lookup);
4141
platform_device_register(&wifi_rfkill_device);
4242
}

‎arch/mips/sgi-ip22/ip22-gio.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,13 @@ static int gio_device_probe(struct device *dev)
143143
return error;
144144
}
145145

146-
static int gio_device_remove(struct device *dev)
146+
static void gio_device_remove(struct device *dev)
147147
{
148148
struct gio_device *gio_dev = to_gio_device(dev);
149149
struct gio_driver *drv = to_gio_driver(dev->driver);
150150

151151
if (dev->driver && drv->remove)
152152
drv->remove(gio_dev);
153-
return 0;
154153
}
155154

156155
static void gio_device_shutdown(struct device *dev)

‎arch/parisc/kernel/drivers.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,13 @@ static int parisc_driver_probe(struct device *dev)
133133
return rc;
134134
}
135135

136-
static int __exit parisc_driver_remove(struct device *dev)
136+
static void __exit parisc_driver_remove(struct device *dev)
137137
{
138138
struct parisc_device *pa_dev = to_parisc_device(dev);
139139
struct parisc_driver *pa_drv = to_parisc_driver(dev->driver);
140+
140141
if (pa_drv->remove)
141142
pa_drv->remove(pa_dev);
142-
143-
return 0;
144143
}
145144

146145

‎arch/powerpc/platforms/ps3/system-bus.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ static int ps3_system_bus_probe(struct device *_dev)
381381
return result;
382382
}
383383

384-
static int ps3_system_bus_remove(struct device *_dev)
384+
static void ps3_system_bus_remove(struct device *_dev)
385385
{
386386
struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
387387
struct ps3_system_bus_driver *drv;
@@ -399,7 +399,6 @@ static int ps3_system_bus_remove(struct device *_dev)
399399
__func__, __LINE__, drv->core.name);
400400

401401
pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev_name(&dev->core));
402-
return 0;
403402
}
404403

405404
static void ps3_system_bus_shutdown(struct device *_dev)

‎arch/powerpc/platforms/pseries/ibmebus.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,14 +366,13 @@ static int ibmebus_bus_device_probe(struct device *dev)
366366
return error;
367367
}
368368

369-
static int ibmebus_bus_device_remove(struct device *dev)
369+
static void ibmebus_bus_device_remove(struct device *dev)
370370
{
371371
struct platform_device *of_dev = to_platform_device(dev);
372372
struct platform_driver *drv = to_platform_driver(dev->driver);
373373

374374
if (dev->driver && drv->remove)
375375
drv->remove(of_dev);
376-
return 0;
377376
}
378377

379378
static void ibmebus_bus_device_shutdown(struct device *dev)

‎arch/powerpc/platforms/pseries/vio.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ static int vio_bus_probe(struct device *dev)
12571257
}
12581258

12591259
/* convert from struct device to struct vio_dev and pass to driver. */
1260-
static int vio_bus_remove(struct device *dev)
1260+
static void vio_bus_remove(struct device *dev)
12611261
{
12621262
struct vio_dev *viodev = to_vio_dev(dev);
12631263
struct vio_driver *viodrv = to_vio_driver(dev->driver);
@@ -1276,7 +1276,6 @@ static int vio_bus_remove(struct device *dev)
12761276
vio_cmo_bus_remove(viodev);
12771277

12781278
put_device(devptr);
1279-
return 0;
12801279
}
12811280

12821281
static void vio_bus_shutdown(struct device *dev)

0 commit comments

Comments
 (0)