tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'firewire-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Browse Source 
Pull firewire updates from Takashi Sakamoto:
 "The pull request includes a few changes, Its main purpose is to
  prepare for my future work by taking over maintainership from Stefan
  Richter. I have plans to work on several items; e.g. packet processing
  in workqueue context instead of tasklet.

  As you may be aware, the IEEE 1394 technology is outdated. However, we
  still have users. It is better to ensure a smooth transition for the
  users to shift to other categories of devices"

* tag 'firewire-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: init_ohci1394_dma: use correct function names in comments
  MAINTAINERS: replace maintainer of FireWire subsystem
This commit is contained in:
Linus Torvalds
2023-04-27 11:27:48 -07:00
parent 34da76dca4 02dc51a0a0
commit b02847fc2e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAINTAINERS
+3 -2
View File
@@ -7990,10 +7990,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
F: drivers/target/sbp/ F: drivers/target/sbp/
FIREWIRE SUBSYSTEM FIREWIRE SUBSYSTEM
M: Stefan Richter <stefanr@s5r6.in-berlin.de> M: Takashi Sakamoto <o-takashi@sakamocchi.jp>
M: Takashi Sakamoto <takaswie@kernel.org>
L: linux1394-devel@lists.sourceforge.net L: linux1394-devel@lists.sourceforge.net
S: Maintained S: Maintained
W: http://ieee1394.wiki.kernel.org/ W: http://ieee1394.docs.kernel.org/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
F: drivers/firewire/ F: drivers/firewire/
F: include/linux/firewire.h F: include/linux/firewire.h
drivers/firewire/init_ohci1394_dma.c
+2 -2
View File
@@ -251,7 +251,7 @@ static inline void __init init_ohci1394_controller(int num, int slot, int func)
} }
/** /**
* debug_init_ohci1394_dma - scan for OHCI1394 controllers and init DMA on them * init_ohci1394_dma_on_all_controllers - scan for OHCI1394 controllers and init DMA on them
* Scans the whole PCI space for OHCI1394 controllers and inits DMA on them * Scans the whole PCI space for OHCI1394 controllers and inits DMA on them
*/ */
void __init init_ohci1394_dma_on_all_controllers(void) void __init init_ohci1394_dma_on_all_controllers(void)
@@ -283,7 +283,7 @@ void __init init_ohci1394_dma_on_all_controllers(void)
} }
/** /**
* setup_init_ohci1394_early - enables early OHCI1394 DMA initialization * setup_ohci1394_dma - enables early OHCI1394 DMA initialization
*/ */
static int __init setup_ohci1394_dma(char *opt) static int __init setup_ohci1394_dma(char *opt)
{ {