History

Merge tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc and other driver subsystem updates from Greg KH: "Here is the big set of char/misc and a number of other driver subsystem updates for 6.9-rc1. Included in here are: - IIO driver updates, loads of new ones and evolution of existing ones - coresight driver updates - const cleanups for many driver subsystems - speakup driver additions - platform remove callback void cleanups - mei driver updates - mhi driver updates - cdx driver updates for MSI interrupt handling - nvmem driver updates - other smaller driver updates and cleanups, full details in the shortlog All of these have been in linux-next for a long time with no reported issue, other than a build warning for the speakup driver" The build warning hits clang and is a gcc (and C23) extension, and is fixed up in the merge. Link: https://lore.kernel.org/all/20240321134831.GA2762840@dev-arch.thelio-3990X/ * tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (279 commits) binder: remove redundant variable page_addr uio_dmem_genirq: UIO_MEM_DMA_COHERENT conversion uio_pruss: UIO_MEM_DMA_COHERENT conversion cnic,bnx2,bnx2x: use UIO_MEM_DMA_COHERENT uio: introduce UIO_MEM_DMA_COHERENT type cdx: add MSI support for CDX bus pps: use cflags-y instead of EXTRA_CFLAGS speakup: Add /dev/synthu device speakup: Fix 8bit characters from direct synth parport: sunbpp: Convert to platform remove callback returning void parport: amiga: Convert to platform remove callback returning void char: xillybus: Convert to platform remove callback returning void vmw_balloon: change maintainership MAINTAINERS: change the maintainer for hpilo driver char: xilinx_hwicap: Fix NULL vs IS_ERR() bug hpet: remove hpets::hp_clocksource platform: goldfish: move the separate 'default' propery for CONFIG_GOLDFISH char: xilinx_hwicap: drop casting to void in dev_set_drvdata greybus: move is_gb_* functions out of greybus.h greybus: Remove usage of the deprecated ida_simple_xx() API ...

Linus Torvalds committed 2 years ago

Commit bb41fe32 parents 0a59b3f 367b356305 files · +15165 −4492Browse files

Showing the changes to drivers/char (3 of 305 files). Show all

Unified · Split

3 files
  1. drivers/char/hpet.c +0 −1
  2. drivers/char/xilinx_hwicap/xilinx_hwicap.c +3 −3
  3. drivers/char/xillybus/xillybus_of.c +2 −4
drivers/char/hpet.c+0−1
@@ -87,7 +87,6 @@ struct hpets { · 86 unmodified lines
8787 struct hpets *hp_next;
8888 struct hpet __iomem *hp_hpet;
8989 unsigned long hp_hpet_phys;
90− struct clocksource *hp_clocksource;
9190 unsigned long long hp_tick_freq;
9291 unsigned long hp_delta;
9392 unsigned int hp_ntimer;
drivers/char/xilinx_hwicap/xilinx_hwicap.c+3−3
@@ -636,11 +636,11 @@ static int hwicap_setup(struct platform_device *pdev, int id, · 635 unmodified lines
636636 retval = -ENOMEM;
637637 goto failed;
638638 }
639− dev_set_drvdata(dev, (void *)drvdata);
639+ dev_set_drvdata(dev, drvdata);
640640
641641 drvdata->base_address = devm_platform_ioremap_resource(pdev, 0);
642− if (!drvdata->base_address) {
643− retval = -ENODEV;
642+ if (IS_ERR(drvdata->base_address)) {
643+ retval = PTR_ERR(drvdata->base_address);
644644 goto failed;
645645 }
646646
drivers/char/xillybus/xillybus_of.c+2−4
@@ -64,19 +64,17 @@ static int xilly_drv_probe(struct platform_device *op) · 63 unmodified lines
6464 return xillybus_endpoint_discovery(endpoint);
6565 }
6666
67−static int xilly_drv_remove(struct platform_device *op)
67+static void xilly_drv_remove(struct platform_device *op)
6868 {
6969 struct device *dev = &op->dev;
7070 struct xilly_endpoint *endpoint = dev_get_drvdata(dev);
7171
7272 xillybus_endpoint_remove(endpoint);
73−
74− return 0;
7573 }
7674
7775 static struct platform_driver xillybus_platform_driver = {
7876 .probe = xilly_drv_probe,
79− .remove = xilly_drv_remove,
77+ .remove_new = xilly_drv_remove,
8078 .driver = {
8179 .name = xillyname,
8280 .of_match_table = xillybus_of_match,