The patch titled drivers/net/chelsio/: #if 0 unused functions has been added to the -mm tree. Its filename is drivers-net-chelsio-if-0-unused-functions.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: drivers/net/chelsio/: #if 0 unused functions From: Adrian Bunk <bunk@xxxxxxxxxx> This patch #if 0's the following unused functions: - espi.c:t1_espi_set_misc_ctrl() - sge.c:t1_sched_set_max_avail_bytes() - sge.c:t1_sched_set_drain_bits_per_us() Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/chelsio/espi.c | 2 ++ drivers/net/chelsio/espi.h | 1 - drivers/net/chelsio/sge.c | 4 ++++ drivers/net/chelsio/sge.h | 2 -- 4 files changed, 6 insertions(+), 3 deletions(-) diff -puN drivers/net/chelsio/espi.c~drivers-net-chelsio-if-0-unused-functions drivers/net/chelsio/espi.c --- a/drivers/net/chelsio/espi.c~drivers-net-chelsio-if-0-unused-functions +++ a/drivers/net/chelsio/espi.c @@ -297,6 +297,7 @@ struct peespi *t1_espi_create(adapter_t return espi; } +#if 0 void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val) { struct peespi *espi = adapter->espi; @@ -309,6 +310,7 @@ void t1_espi_set_misc_ctrl(adapter_t *ad writel(espi->misc_ctrl, adapter->regs + A_ESPI_MISC_CONTROL); spin_unlock(&espi->lock); } +#endif /* 0 */ u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait) { diff -puN drivers/net/chelsio/espi.h~drivers-net-chelsio-if-0-unused-functions drivers/net/chelsio/espi.h --- a/drivers/net/chelsio/espi.h~drivers-net-chelsio-if-0-unused-functions +++ a/drivers/net/chelsio/espi.h @@ -62,7 +62,6 @@ void t1_espi_intr_disable(struct peespi int t1_espi_intr_handler(struct peespi *); const struct espi_intr_counts *t1_espi_get_intr_counts(struct peespi *espi); -void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val); u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait); int t1_espi_get_mon_t204(adapter_t *, u32 *, u8); diff -puN drivers/net/chelsio/sge.c~drivers-net-chelsio-if-0-unused-functions drivers/net/chelsio/sge.c --- a/drivers/net/chelsio/sge.c~drivers-net-chelsio-if-0-unused-functions +++ a/drivers/net/chelsio/sge.c @@ -330,6 +330,8 @@ unsigned int t1_sched_update_parms(struc return max_avail_segs * (p->mtu - 40); } +#if 0 + /* * t1_sched_max_avail_bytes() tells the scheduler the maximum amount of * data that can be pushed per port. @@ -357,6 +359,8 @@ void t1_sched_set_drain_bits_per_us(stru t1_sched_update_parms(sge, port, 0, 0); } +#endif /* 0 */ + /* * get_clock() implements a ns clock (see ktime_get) diff -puN drivers/net/chelsio/sge.h~drivers-net-chelsio-if-0-unused-functions drivers/net/chelsio/sge.h --- a/drivers/net/chelsio/sge.h~drivers-net-chelsio-if-0-unused-functions +++ a/drivers/net/chelsio/sge.h @@ -89,8 +89,6 @@ void t1_sge_intr_disable(struct sge *); void t1_sge_intr_clear(struct sge *); const struct sge_intr_counts *t1_sge_get_intr_counts(const struct sge *sge); void t1_sge_get_port_stats(const struct sge *sge, int port, struct sge_port_stats *); -void t1_sched_set_max_avail_bytes(struct sge *, unsigned int); -void t1_sched_set_drain_bits_per_us(struct sge *, unsigned int, unsigned int); unsigned int t1_sched_update_parms(struct sge *, unsigned int, unsigned int, unsigned int); _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are origin.patch lguest_userc-fix-memory-leak.patch video-sis-fix-negative-array-index.patch dvb-bt8xx-dstc-make-code-static.patch dvb-usb-gp8pskc-if-0-gp8psk_bcm4500_reload.patch dvb-usb-vp702xc-cleanups.patch dvb-usb-make-some-debug-vars-static.patch media-common-ir-functionsc-make-a-function-static.patch cx88-mpegc-make-4-functions-static.patch media-video-et61x251-make-5-functions-static.patch git-hwmon.patch fs-dlm-proper-prototypes.patch make-jffs2_get_acl-static.patch make-sunrpc-xprtsockcxs_setup_udptcp-static.patch git-netdev-all.patch drivers-net-chelsio-if-0-unused-functions.patch drivers-bluetooth-bpa10xc-fix-memleak.patch drivers-bluetooth-btsdioc-fix-double-free.patch git-nfs-make-nfs_wb_page_priority-static.patch fs-nfs-dirc-should-include-internalh.patch proper-prototype-for-kernel-schedcmigration_init.patch git-scsi-misc.patch scsi-advansysc-make-3-functions-static.patch scsi-qla2xxx-possible-cleanups.patch usb-mon-mon_binc-cleanups.patch xtensa-iss_net_setup-must-be-__init.patch xtensa-kernel-setupc-remove-dead-code.patch sunrpc-xprtrdma-transportc-fix-use-after-free.patch fix-mm-utilckrealloc.patch fuse_file_alloc-fix-null-dereferences.patch pidns-place-under-config_experimental.patch pidns-place-under-config_experimental-checkpatch-fixes.patch feature-removal-schedule-remove-sa_-flags-entry.patch kernel-taskstatsc-fix-bogus-nlmsg_free.patch mm-hugetlbc-make-a-function-static.patch mm-page-writebackc-make-a-function-static.patch make-__vmalloc_area_node-static.patch blackfin-remove-dump_thread.patch kernel-power-diskc-make-code-static.patch make-kernel_shutdown_prepare-static.patch kernel-power-move-function-prototypes-to-header.patch kill-udffs_dateversion.patch make-ipc-utilcsysvipc_find_ipc-static.patch cleanup-after-apus-removal.patch remove-mm_ptovvtop.patch remove-__attribute_used__.patch remove-__attribute_used__-checkpatch-fixes.patch proper-show_interrupts-prototype.patch scheduled-oss-driver-removal.patch linux-inith-simplify-__meminitexit-dependencies.patch proper-prototype-for-signals_init.patch kernel-ptracec-should-include-linux-syscallsh.patch make-srcu_readers_active-static.patch kernel-notifierc-should-include-linux-rebooth.patch proper-prototype-for-get_filesystem_list.patch fs-utimesc-should-include-linux-syscallsh.patch fs-signalfdc-should-include-linux-syscallsh.patch fs-eventfdc-should-include-linux-syscallsh.patch proper-prototype-for-vty_init.patch drivers-misc-lkdtmc-cleanups.patch power_supply_ledssysfsc-should-include-power_supplyh.patch fs-ecryptfs-possible-cleanups.patch make-video-geode-lxfb_corecgeode_modedb-static.patch video-hpfbc-section-fix.patch ext4-superc-fix-ifdefs.patch make-jbd-journalc__journal_abort_hard-static.patch move-edactxt-two-levels-up.patch remove-documentation-smptxt.patch kernel-cgroupc-remove-dead-code.patch kernel-cgroupc-make-2-functions-static.patch memory-controller-add-per-container-lru-and-reclaim-v7.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch fix-m32r-__xchg.patch reiser4.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