Skip to content

Commit ccdbf91

Browse files
committed
Merge tag 'driver-core-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH: "Here are two driver fixes for regressions from 6.11-rc1 due to the driver core change making a structure in a driver core callback const. These were missed by all testing EXCEPT for what Bart happened to be running, so I appreciate the fixes provided here for some odd/not-often-used driver subsystems that nothing else happened to catch. Both of these fixes have been in linux-next all week with no reported issues" * tag 'driver-core-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: mips: sgi-ip22: Fix the build ARM: riscpc: ecard: Fix the build
2 parents e1bc113 + cdd1fa9 commit ccdbf91

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm/mach-rpc/ecard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ void ecard_remove_driver(struct ecard_driver *drv)
11091109
driver_unregister(&drv->drv);
11101110
}
11111111

1112-
static int ecard_match(struct device *_dev, struct device_driver *_drv)
1112+
static int ecard_match(struct device *_dev, const struct device_driver *_drv)
11131113
{
11141114
struct expansion_card *ec = ECARD_DEV(_dev);
11151115
struct ecard_driver *drv = ECARD_DRV(_drv);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void gio_device_unregister(struct gio_device *giodev)
111111
}
112112
EXPORT_SYMBOL_GPL(gio_device_unregister);
113113

114-
static int gio_bus_match(struct device *dev, struct device_driver *drv)
114+
static int gio_bus_match(struct device *dev, const struct device_driver *drv)
115115
{
116116
struct gio_device *gio_dev = to_gio_device(dev);
117117
struct gio_driver *gio_drv = to_gio_driver(drv);

0 commit comments

Comments
 (0)