The patch titled Alchemy: Delete unused pt_regs 1664618.patch COPYING CREDITS CREDITS~git-gfs2 CREDITS~origin CREDITS~rcu-credits-and-maintainers CREDITS~small-update-to-credits CREDITS~sys-modules-patch-allow-full-length-section-names CVS Documentation Kbuild Kbuild~origin MAINTAINERS MAINTAINERS.orig MAINTAINERS~add-to-maintainers-file MAINTAINERS~ecryptfs-add-a-maintainers-entry MAINTAINERS~edac-new-opteron-athlon64-memory-controller-driver MAINTAINERS~git-block MAINTAINERS~git-gfs2 MAINTAINERS~git-ieee1394 MAINTAINERS~git-netdev-all MAINTAINERS~mmc-driver-for-ti-flashmedia-card-reader-source MAINTAINERS~move-ide-to-unmaintained-drop-reference-to-old-git-tree MAINTAINERS~network-block-device-is-mostly-known-as-nbd MAINTAINERS~origin MAINTAINERS~rcu-credits-and-maintainers MAINTAINERS~statistics-infrastructure MAINTAINERS~superh-list-is-moderated MAINTAINERS~superh-maintainership-change MAINTAINERS~the-scheduled-removal-of-some-oss-drivers Makefile Makefile.orig Makefile.rej Makefile~! add-config_headers_check-option-to-automatically-run-make-headers_check Makefile~add-config_headers_check-option-to-automatically-run-make-headers_check-nobble Makefile~mm Makefile~origin Makefile~uml-add-checkstack-support Module.symvers README REPORTING-BUGS System.map Tags W13364 applied-patches arch big bin block crypto dotconfig drivers fs git-8139cp git-8139cp.patch git-acpi git-acpi.patch git-agpgart git-agpgart.patch git-alsa git-alsa.patch git-arm git-arm.patch git-audit-master git-audit-master.patch git-block git-block.patch git-cifs git-cifs.patch git-cpufreq git-cpufreq.patch git-cryptodev git-cryptodev.patch git-davej-x86 git-davej-x86.patch git-drm git-drm.patch git-drvmodel git-drvmodel.patch git-dvb git-dvb.patch git-geode git-geode.patch git-gfs2 git-gfs2.patch git-ia64 git-ia64.patch git-ieee1394 git-ieee1394.patch git-infiniband git-infiniband.patch git-input git-input.patch git-intelfb git-intelfb.patch git-jfs git-jfs.patch git-kbuild git-kbuild.patch gi! t-kgdb git-kgdb.patch git-libata-all git-libata-all.patch git! -lxdialo g git-lxdialog.patch git-magic git-magic.patch git-mips git-mips.patch git-mmc git-mmc.patch git-mtd git-mtd.patch git-net git-net.patch git-netdev-all git-netdev-all.patch git-nfs git-nfs.patch git-ntfs git-ntfs.patch git-ocfs2 git-ocfs2.patch git-parisc git-parisc.patch git-pcmcia git-pcmcia.patch git-powerpc git-powerpc.patch git-r8169 git-r8169.patch git-s390 git-s390.patch git-sas git-sas.patch git-scsi-misc git-scsi-misc.patch git-scsi-rc-fixes git-scsi-rc-fixes.patch git-scsi-target git-scsi-target.patch git-serial git-serial.patch git-supertrak git-supertrak.patch git-ucb git-ucb.patch git-watchdog git-watchdog.patch git-wireless git-wireless.patch git-xfs git-xfs.patch include init ipc kernel lib mm net notes origin origin.patch patches pc plopped-patches scripts security series sound test.log.0 txt usr vmlinux argument from au1xxx_dbdma_chan_alloc has been removed from the -mm tree. Its filename is alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Alchemy: Delete unused pt_regs 1664618.patch COPYING CREDITS CREDITS~git-gfs2 CREDITS~origin CREDITS~rcu-credits-and-maintainers CREDITS~small-update-to-credits CREDITS~sys-modules-patch-allow-full-length-section-names CVS Documentation Kbuild Kbuild~origin MAINTAINERS MAINTAINERS.orig MAINTAINERS~add-to-maintainers-file MAINTAINERS~ecryptfs-add-a-maintainers-entry MAINTAINERS~edac-new-opteron-athlon64-memory-controller-driver MAINTAINERS~git-block MAINTAINERS~git-gfs2 MAINTAINERS~git-ieee1394 MAINTAINERS~git-netdev-all MAINTAINERS~mmc-driver-for-ti-flashmedia-card-reader-source MAINTAINERS~move-ide-to-unmaintained-drop-reference-to-old-git-tree MAINTAINERS~network-block-device-is-mostly-known-as-nbd MAINTAINERS~origin MAINTAINERS~rcu-credits-and-maintainers MAINTAINERS~statistics-infrastructure MAINTAINERS~superh-list-is-moderated MAINTAINERS~superh-maintainership-change MAINTAINERS~the-scheduled-removal-of-some-oss-drivers Makefile Makefile.orig Makefile.rej Makef! ile~add-config_headers_check-option-to-automatically-run-make-headers_check Makefile~add-config_headers_check-option-to-automatically-run-make-headers_check-nobble Makefile~mm Makefile~origin Makefile~uml-add-checkstack-support Module.symvers README REPORTING-BUGS System.map Tags W13364 applied-patches arch big bin block crypto dotconfig drivers fs git-8139cp git-8139cp.patch git-acpi git-acpi.patch git-agpgart git-agpgart.patch git-alsa git-alsa.patch git-arm git-arm.patch git-audit-master git-audit-master.patch git-block git-block.patch git-cifs git-cifs.patch git-cpufreq git-cpufreq.patch git-cryptodev git-cryptodev.patch git-davej-x86 git-davej-x86.patch git-drm git-drm.patch git-drvmodel git-drvmodel.patch git-dvb git-dvb.patch git-geode git-geode.patch git-gfs2 git-gfs2.patch git-ia64 git-ia64.patch git-ieee1394 git-ieee1394.patch git-infiniband git-infiniband.patch git-input git-input.patch git-intelfb git-intelfb.patch git-jfs git-jfs.patch git-kbuild git-kbuild.patc! h git-kgdb git-kgdb.patch git-libata-all git-libata-all.patch! git-lxd ialog git-lxdialog.patch git-magic git-magic.patch git-mips git-mips.patch git-mmc git-mmc.patch git-mtd git-mtd.patch git-net git-net.patch git-netdev-all git-netdev-all.patch git-nfs git-nfs.patch git-ntfs git-ntfs.patch git-ocfs2 git-ocfs2.patch git-parisc git-parisc.patch git-pcmcia git-pcmcia.patch git-powerpc git-powerpc.patch git-r8169 git-r8169.patch git-s390 git-s390.patch git-sas git-sas.patch git-scsi-misc git-scsi-misc.patch git-scsi-rc-fixes git-scsi-rc-fixes.patch git-scsi-target git-scsi-target.patch git-serial git-serial.patch git-supertrak git-supertrak.patch git-ucb git-ucb.patch git-watchdog git-watchdog.patch git-wireless git-wireless.patch git-xfs git-xfs.patch include init ipc kernel lib mm net notes origin origin.patch patches pc plopped-patches scripts security series sound test.log.0 txt usr vmlinux argument from au1xxx_dbdma_chan_alloc From: Ralf Baechle <ralf@xxxxxxxxxxxxxx> The third argument of au1xxx_dbdma_chan_alloc's callback function is not used anywhere. Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/mips/au1000/common/dbdma.c | 10 ++++++---- drivers/ide/mips/au1xxx-ide.c | 4 ++-- drivers/mmc/au1xmmc.c | 2 +- include/asm-mips/mach-au1x00/au1xxx_dbdma.h | 6 +++--- sound/oss/au1550_ac97.c | 6 ++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff -puN arch/mips/au1000/common/dbdma.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc arch/mips/au1000/common/dbdma.c --- a/arch/mips/au1000/common/dbdma.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc +++ a/arch/mips/au1000/common/dbdma.c @@ -230,7 +230,7 @@ EXPORT_SYMBOL(au1xxx_ddma_add_device); */ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, - void (*callback)(int, void *, struct pt_regs *), void *callparam) + void (*callback)(int, void *), void *callparam) { unsigned long flags; u32 used, chan, rv; @@ -248,8 +248,10 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d au1xxx_dbdma_init(); dbdma_initialized = 1; - if ((stp = find_dbdev_id(srcid)) == NULL) return 0; - if ((dtp = find_dbdev_id(destid)) == NULL) return 0; + if ((stp = find_dbdev_id(srcid)) == NULL) + return 0; + if ((dtp = find_dbdev_id(destid)) == NULL) + return 0; used = 0; rv = 0; @@ -869,7 +871,7 @@ dbdma_interrupt(int irq, void *dev_id, s au_sync(); if (ctp->chan_callback) - (ctp->chan_callback)(irq, ctp->chan_callparam, regs); + (ctp->chan_callback)(irq, ctp->chan_callparam); ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); return IRQ_RETVAL(1); diff -puN drivers/ide/mips/au1xxx-ide.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc drivers/ide/mips/au1xxx-ide.c --- a/drivers/ide/mips/au1xxx-ide.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc +++ a/drivers/ide/mips/au1xxx-ide.c @@ -476,13 +476,13 @@ static int auide_dma_lostirq(ide_drive_t return 0; } -static void auide_ddma_tx_callback(int irq, void *param, struct pt_regs *regs) +static void auide_ddma_tx_callback(int irq, void *param) { _auide_hwif *ahwif = (_auide_hwif*)param; ahwif->drive->waiting_for_dma = 0; } -static void auide_ddma_rx_callback(int irq, void *param, struct pt_regs *regs) +static void auide_ddma_rx_callback(int irq, void *param) { _auide_hwif *ahwif = (_auide_hwif*)param; ahwif->drive->waiting_for_dma = 0; diff -puN drivers/mmc/au1xmmc.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc drivers/mmc/au1xmmc.c --- a/drivers/mmc/au1xmmc.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc +++ a/drivers/mmc/au1xmmc.c @@ -731,7 +731,7 @@ static void au1xmmc_set_ios(struct mmc_h } } -static void au1xmmc_dma_callback(int irq, void *dev_id, struct pt_regs *regs) +static void au1xmmc_dma_callback(int irq, void *dev_id) { struct au1xmmc_host *host = (struct au1xmmc_host *) dev_id; diff -puN include/asm-mips/mach-au1x00/au1xxx_dbdma.h~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc include/asm-mips/mach-au1x00/au1xxx_dbdma.h --- a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc +++ a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h @@ -316,7 +316,7 @@ typedef struct dbdma_chan_config { au1x_ddma_desc_t *chan_desc_base; au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; void *chan_callparam; - void (*chan_callback)(int, void *, struct pt_regs *); + void (*chan_callback)(int, void *); } chan_tab_t; #define DEV_FLAGS_INUSE (1 << 0) @@ -334,8 +334,8 @@ typedef struct dbdma_chan_config { * meaningful name. The 'callback' is called during dma completion * interrupt. */ -u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, - void (*callback)(int, void *, struct pt_regs *), void *callparam); +extern u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, + void (*callback)(int, void *), void *callparam); #define DBDMA_MEM_CHAN DSCR_CMD0_ALWAYS diff -puN sound/oss/au1550_ac97.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc sound/oss/au1550_ac97.c --- a/sound/oss/au1550_ac97.c~alchemy-delete-unused-pt_regs-argument-from-au1xxx_dbdma_chan_alloc +++ a/sound/oss/au1550_ac97.c @@ -719,8 +719,7 @@ prog_dmabuf_dac(struct au1550_state *s) } -static void -dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) +static void dac_dma_interrupt(int irq, void *dev_id) { struct au1550_state *s = (struct au1550_state *) dev_id; struct dmabuf *db = &s->dma_dac; @@ -754,8 +753,7 @@ dac_dma_interrupt(int irq, void *dev_id, } -static void -adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) +static void adc_dma_interrupt(int irq, void *dev_id) { struct au1550_state *s = (struct au1550_state *)dev_id; struct dmabuf *dp = &s->dma_adc; _ Patches currently in -mm which might be from ralf@xxxxxxxxxxxxxx are origin.patch kthread-update-arch-mips-kernel-apmc.patch git-serial.patch consistently-use-max_errno-in-__syscall_return-fix.patch sound-mips-au1x00-use-array_size-macro.patch simplify-update_times-avoid-jiffies-jiffies_64-aliasing-problem-2.patch kill-wall_jiffies.patch generic-ioremap_page_range-implementation.patch generic-ioremap_page_range-flush_cache_vmap.patch generic-ioremap_page_range-mips-conversion.patch generic-ioremap_page_range-mips-conversion-fix.patch introduce-kernel_execve.patch rename-the-provided-execve-functions-to-kernel_execve.patch provide-kernel_execve-on-all-architectures.patch provide-kernel_execve-on-all-architectures-fix.patch provide-kernel_execve-on-all-architectures-mips-fix.patch remove-the-use-of-_syscallx-macros-in-uml.patch sh64-remove-the-use-of-kernel-syscalls.patch remove-remaining-errno-and-__kernel_syscalls__-references.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html