The patch titled make qla2x00_reg_remote_port() static has been added to the -mm tree. Its filename is make-qla2x00_reg_remote_port-static.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: make qla2x00_reg_remote_port() static From: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Acked-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/qla2xxx/qla_gbl.h | 1 drivers/scsi/qla2xxx/qla_init.c | 68 +++++++++++++++--------------- 2 files changed, 34 insertions(+), 35 deletions(-) diff -puN drivers/scsi/qla2xxx/qla_gbl.h~make-qla2x00_reg_remote_port-static drivers/scsi/qla2xxx/qla_gbl.h --- a/drivers/scsi/qla2xxx/qla_gbl.h~make-qla2x00_reg_remote_port-static +++ a/drivers/scsi/qla2xxx/qla_gbl.h @@ -45,7 +45,6 @@ extern void qla2x00_update_fcports(scsi_ extern int qla2x00_abort_isp(scsi_qla_host_t *); extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *); -extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *); extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *); extern void qla2x00_try_to_stop_firmware(scsi_qla_host_t *); diff -puN drivers/scsi/qla2xxx/qla_init.c~make-qla2x00_reg_remote_port-static drivers/scsi/qla2xxx/qla_init.c --- a/drivers/scsi/qla2xxx/qla_init.c~make-qla2x00_reg_remote_port-static +++ a/drivers/scsi/qla2xxx/qla_init.c @@ -2103,40 +2103,7 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha } } -/* - * qla2x00_update_fcport - * Updates device on list. - * - * Input: - * ha = adapter block pointer. - * fcport = port structure pointer. - * - * Return: - * 0 - Success - * BIT_0 - error - * - * Context: - * Kernel context. - */ -void -qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) -{ - fcport->ha = ha; - fcport->login_retry = 0; - fcport->port_login_retry_count = ha->port_down_retry_count * - PORT_RETRY_TIME; - atomic_set(&fcport->port_down_timer, ha->port_down_retry_count * - PORT_RETRY_TIME); - fcport->flags &= ~FCF_LOGIN_NEEDED; - - qla2x00_iidma_fcport(ha, fcport); - - atomic_set(&fcport->state, FCS_ONLINE); - - qla2x00_reg_remote_port(ha, fcport); -} - -void +static void qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport) { struct fc_rport_identifiers rport_ids; @@ -2179,6 +2146,39 @@ qla2x00_reg_remote_port(scsi_qla_host_t } /* + * qla2x00_update_fcport + * Updates device on list. + * + * Input: + * ha = adapter block pointer. + * fcport = port structure pointer. + * + * Return: + * 0 - Success + * BIT_0 - error + * + * Context: + * Kernel context. + */ +void +qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) +{ + fcport->ha = ha; + fcport->login_retry = 0; + fcport->port_login_retry_count = ha->port_down_retry_count * + PORT_RETRY_TIME; + atomic_set(&fcport->port_down_timer, ha->port_down_retry_count * + PORT_RETRY_TIME); + fcport->flags &= ~FCF_LOGIN_NEEDED; + + qla2x00_iidma_fcport(ha, fcport); + + atomic_set(&fcport->state, FCS_ONLINE); + + qla2x00_reg_remote_port(ha, fcport); +} + +/* * qla2x00_configure_fabric * Setup SNS devices with loop ID's. * _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch make-drivers-acpi-baycdrive_bays-static.patch make-drivers-acpi-eccec_ecdt-static.patch drivers-acpi-oslc-fix-a-null-check.patch git-alsa.patch tidy-gregkh-driver-udev-compatible-hack.patch git-dvb.patch git-gfs2-nmw.patch fs-dlm-lowcomms-tcpc-remove-2-functions.patch git-mtd.patch git-net.patch net-uninline-skb_put-fix.patch git-ocfs2.patch drivers-pci-hotplug-ibmphp_pcic-fix-null-dereference.patch git-scsi-misc.patch drivers-scsi-small-cleanups.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch drivers-scsi-aic7xxx-make-functions-static.patch make-qla2x00_reg_remote_port-static.patch make-drivers-usb-host-u132-hcdcu132_hcd_wait-static.patch make-drivers-usb-input-wacom_syscwacom_sys_irq-static.patch drivers-usb-misc-ftdi-elanc-fixes-and-cleanups.patch make-drivers-usb-core-drivercusb_device_match-static.patch arch-i386-kernel-remove-remaining-pc98-code.patch git-cryptodev.patch make-mm-thrashcglobal_faults-static.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch remove-drivers-pci-searchcpci_find_device_reverse.patch ext4_ext_split-remove-dead-code.patch the-scheduled-removal-of-some-oss-options.patch make-arch-i386-pci-commoncpci_bf_sort-static.patch make-mm-shmemcshmem_xattr_security_handler-static.patch remove-kernel-lockdepclockdep_internal.patch make-kernel-signalckill_proc_info-static.patch make-ecryptfs_version_str_map-static.patch make-fs-jbd-transactionc__journal_temp_unlink_buffer-static.patch make-fs-jbd2-transactionc__jbd2_journal_temp_unlink_buffer-static.patch fs-lockd-hostc-make-2-functions-static.patch make-fs-proc-basecproc_pid_instantiate-static.patch make-ext2_get_blocks-static.patch drivers-mtd-nand-rtc_from4c-use-lib-bitrevc.patch reiser4-export-remove_from_page_cache-fix.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch fs-reiser4-possible-cleanups-2.patch make-drivers-md-dm-snapcksnapd-static.patch gtod-persistent-clock-support-core-remove-kernel-timercwall_jiffies.patch gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie-make-kernel-timerc__next_timer_interrupt-static.patch updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch slab-cache-shrinker-statistics.patch debug-shared-irqs-kconfig-fix.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.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