aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/fcoe/fc_transport_fcoe.c11
-rw-r--r--drivers/scsi/fcoe/libfcoe.c15
-rw-r--r--drivers/scsi/libfc/fc_exch.c10
-rw-r--r--drivers/scsi/libfc/fc_rport.c4
4 files changed, 20 insertions, 20 deletions
diff --git a/drivers/scsi/fcoe/fc_transport_fcoe.c b/drivers/scsi/fcoe/fc_transport_fcoe.c
index 0eea4c434c31..847453a70c62 100644
--- a/drivers/scsi/fcoe/fc_transport_fcoe.c
+++ b/drivers/scsi/fcoe/fc_transport_fcoe.c
@@ -62,8 +62,9 @@ struct pci_dev *fcoe_transport_pcidev(const struct net_device *netdev)
62 * 62 *
63 * Returns: 0 for success 63 * Returns: 0 for success
64 */ 64 */
65static struct fcoe_transport_internal *fcoe_transport_device_lookup( 65static struct fcoe_transport_internal *
66 struct fcoe_transport *t, struct net_device *netdev) 66fcoe_transport_device_lookup(struct fcoe_transport *t,
67 struct net_device *netdev)
67{ 68{
68 struct fcoe_transport_internal *ti; 69 struct fcoe_transport_internal *ti;
69 70
@@ -184,7 +185,7 @@ static void fcoe_transport_device_remove_all(struct fcoe_transport *t)
184 * Returns: true for match up 185 * Returns: true for match up
185 */ 186 */
186static bool fcoe_transport_match(struct fcoe_transport *t, 187static bool fcoe_transport_match(struct fcoe_transport *t,
187 struct net_device *netdev) 188 struct net_device *netdev)
188{ 189{
189 /* match transport by vendor and device id */ 190 /* match transport by vendor and device id */
190 struct pci_dev *pci; 191 struct pci_dev *pci;
@@ -217,8 +218,8 @@ static bool fcoe_transport_match(struct fcoe_transport *t,
217 * 218 *
218 * TODO: return default sw transport if no other transport is found 219 * TODO: return default sw transport if no other transport is found
219 */ 220 */
220static struct fcoe_transport *fcoe_transport_lookup( 221static struct fcoe_transport *
221 struct net_device *netdev) 222fcoe_transport_lookup(struct net_device *netdev)
222{ 223{
223 struct fcoe_transport *t; 224 struct fcoe_transport *t;
224 225
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index 5e68652985b2..d006d6576817 100644
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -949,8 +949,8 @@ static struct net_device *fcoe_if_to_netdev(const char *buffer)
949 * 949 *
950 * Returns: ptr to the struct module, NULL for failure 950 * Returns: ptr to the struct module, NULL for failure
951 */ 951 */
952static struct module *fcoe_netdev_to_module_owner( 952static struct module *
953 const struct net_device *netdev) 953fcoe_netdev_to_module_owner(const struct net_device *netdev)
954{ 954{
955 struct device *dev; 955 struct device *dev;
956 956
@@ -1205,8 +1205,8 @@ EXPORT_SYMBOL_GPL(fcoe_clean_pending_queue);
1205 * Returns: ptr to Scsi_Host 1205 * Returns: ptr to Scsi_Host
1206 * TODO: to libfc? 1206 * TODO: to libfc?
1207 */ 1207 */
1208static inline struct Scsi_Host *libfc_host_alloc( 1208static inline struct Scsi_Host *
1209 struct scsi_host_template *sht, int priv_size) 1209libfc_host_alloc(struct scsi_host_template *sht, int priv_size)
1210{ 1210{
1211 return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size); 1211 return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);
1212} 1212}
@@ -1285,8 +1285,8 @@ EXPORT_SYMBOL_GPL(fcoe_wwn_from_mac);
1285 * 1285 *
1286 * Returns: NULL or the located fcoe_softc 1286 * Returns: NULL or the located fcoe_softc
1287 */ 1287 */
1288static struct fcoe_softc *fcoe_hostlist_lookup_softc( 1288static struct fcoe_softc *
1289 const struct net_device *dev) 1289fcoe_hostlist_lookup_softc(const struct net_device *dev)
1290{ 1290{
1291 struct fcoe_softc *fc; 1291 struct fcoe_softc *fc;
1292 1292
@@ -1426,7 +1426,6 @@ static int __init fcoe_init(void)
1426 } else { 1426 } else {
1427 fcoe_percpu[cpu] = NULL; 1427 fcoe_percpu[cpu] = NULL;
1428 kfree(p); 1428 kfree(p);
1429
1430 } 1429 }
1431 } 1430 }
1432 } 1431 }
@@ -1476,7 +1475,7 @@ static void __exit fcoe_exit(void)
1476 */ 1475 */
1477 del_timer_sync(&fcoe_timer); 1476 del_timer_sync(&fcoe_timer);
1478 1477
1479 /* releases the assocaited fcoe transport for each lport */ 1478 /* releases the associated fcoe transport for each lport */
1480 list_for_each_entry_safe(fc, tmp, &fcoe_hostlist, list) 1479 list_for_each_entry_safe(fc, tmp, &fcoe_hostlist, list)
1481 fcoe_transport_release(fc->real_dev); 1480 fcoe_transport_release(fc->real_dev);
1482 1481
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 8c4018956d4c..7b933954c107 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -675,8 +675,8 @@ static struct fc_exch *fc_exch_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
675 * If fc_pf_rjt_reason is FC_RJT_NONE then this function will have a hold 675 * If fc_pf_rjt_reason is FC_RJT_NONE then this function will have a hold
676 * on the ep that should be released by the caller. 676 * on the ep that should be released by the caller.
677 */ 677 */
678static enum fc_pf_rjt_reason 678static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_exch_mgr *mp,
679fc_seq_lookup_recip(struct fc_exch_mgr *mp, struct fc_frame *fp) 679 struct fc_frame *fp)
680{ 680{
681 struct fc_frame_header *fh = fc_frame_header_get(fp); 681 struct fc_frame_header *fh = fc_frame_header_get(fp);
682 struct fc_exch *ep = NULL; 682 struct fc_exch *ep = NULL;
@@ -994,9 +994,9 @@ static void fc_seq_send_ack(struct fc_seq *sp, const struct fc_frame *rx_fp)
994 * Send BLS Reject. 994 * Send BLS Reject.
995 * This is for rejecting BA_ABTS only. 995 * This is for rejecting BA_ABTS only.
996 */ 996 */
997static void 997static void fc_exch_send_ba_rjt(struct fc_frame *rx_fp,
998fc_exch_send_ba_rjt(struct fc_frame *rx_fp, enum fc_ba_rjt_reason reason, 998 enum fc_ba_rjt_reason reason,
999 enum fc_ba_rjt_explan explan) 999 enum fc_ba_rjt_explan explan)
1000{ 1000{
1001 struct fc_frame *fp; 1001 struct fc_frame *fp;
1002 struct fc_frame_header *rx_fh; 1002 struct fc_frame_header *rx_fh;
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index 6f07de15c491..dae65133a833 100644
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -179,8 +179,8 @@ EXPORT_SYMBOL(fc_set_rport_loss_tmo);
179 * @flp: FLOGI payload structure 179 * @flp: FLOGI payload structure
180 * @maxval: upper limit, may be less than what is in the service parameters 180 * @maxval: upper limit, may be less than what is in the service parameters
181 */ 181 */
182static unsigned int 182static unsigned int fc_plogi_get_maxframe(struct fc_els_flogi *flp,
183fc_plogi_get_maxframe(struct fc_els_flogi *flp, unsigned int maxval) 183 unsigned int maxval)
184{ 184{
185 unsigned int mfs; 185 unsigned int mfs;
186 186