diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 2c904536b8b6..5987f8b6a59b 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -305,7 +305,7 @@ mpt_turbo_reply(MPT_ADAPTER *ioc, u32 pa) | |||
305 | 305 | ||
306 | /* Check for (valid) IO callback! */ | 306 | /* Check for (valid) IO callback! */ |
307 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS || | 307 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS || |
308 | MptCallbacks[cb_idx] == NULL) { | 308 | MptCallbacks[cb_idx] == NULL) { |
309 | printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n", | 309 | printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n", |
310 | __FUNCTION__, ioc->name, cb_idx); | 310 | __FUNCTION__, ioc->name, cb_idx); |
311 | goto out; | 311 | goto out; |
@@ -369,7 +369,7 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa) | |||
369 | 369 | ||
370 | /* Check for (valid) IO callback! */ | 370 | /* Check for (valid) IO callback! */ |
371 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS || | 371 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS || |
372 | MptCallbacks[cb_idx] == NULL) { | 372 | MptCallbacks[cb_idx] == NULL) { |
373 | printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n", | 373 | printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n", |
374 | __FUNCTION__, ioc->name, cb_idx); | 374 | __FUNCTION__, ioc->name, cb_idx); |
375 | freeme = 0; | 375 | freeme = 0; |
@@ -621,7 +621,7 @@ mpt_register(MPT_CALLBACK cbfunc, MPT_DRIVER_CLASS dclass) | |||
621 | void | 621 | void |
622 | mpt_deregister(u8 cb_idx) | 622 | mpt_deregister(u8 cb_idx) |
623 | { | 623 | { |
624 | if (cb_idx && (cb_idx < MPT_MAX_PROTOCOL_DRIVERS)) { | 624 | if (cb_idx && (cb_idx < MPT_MAX_PROTOCOL_DRIVERS)) { |
625 | MptCallbacks[cb_idx] = NULL; | 625 | MptCallbacks[cb_idx] = NULL; |
626 | MptDriverClass[cb_idx] = MPTUNKNOWN_DRIVER; | 626 | MptDriverClass[cb_idx] = MPTUNKNOWN_DRIVER; |
627 | MptEvHandlers[cb_idx] = NULL; | 627 | MptEvHandlers[cb_idx] = NULL; |
@@ -645,7 +645,7 @@ mpt_deregister(u8 cb_idx) | |||
645 | int | 645 | int |
646 | mpt_event_register(u8 cb_idx, MPT_EVHANDLER ev_cbfunc) | 646 | mpt_event_register(u8 cb_idx, MPT_EVHANDLER ev_cbfunc) |
647 | { | 647 | { |
648 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) | 648 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) |
649 | return -1; | 649 | return -1; |
650 | 650 | ||
651 | MptEvHandlers[cb_idx] = ev_cbfunc; | 651 | MptEvHandlers[cb_idx] = ev_cbfunc; |
@@ -665,7 +665,7 @@ mpt_event_register(u8 cb_idx, MPT_EVHANDLER ev_cbfunc) | |||
665 | void | 665 | void |
666 | mpt_event_deregister(u8 cb_idx) | 666 | mpt_event_deregister(u8 cb_idx) |
667 | { | 667 | { |
668 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) | 668 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) |
669 | return; | 669 | return; |
670 | 670 | ||
671 | MptEvHandlers[cb_idx] = NULL; | 671 | MptEvHandlers[cb_idx] = NULL; |
@@ -722,7 +722,7 @@ mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, u8 cb_idx) | |||
722 | MPT_ADAPTER *ioc; | 722 | MPT_ADAPTER *ioc; |
723 | const struct pci_device_id *id; | 723 | const struct pci_device_id *id; |
724 | 724 | ||
725 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) | 725 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) |
726 | return -EINVAL; | 726 | return -EINVAL; |
727 | 727 | ||
728 | MptDeviceDriverHandlers[cb_idx] = dd_cbfunc; | 728 | MptDeviceDriverHandlers[cb_idx] = dd_cbfunc; |
@@ -749,7 +749,7 @@ mpt_device_driver_deregister(u8 cb_idx) | |||
749 | struct mpt_pci_driver *dd_cbfunc; | 749 | struct mpt_pci_driver *dd_cbfunc; |
750 | MPT_ADAPTER *ioc; | 750 | MPT_ADAPTER *ioc; |
751 | 751 | ||
752 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) | 752 | if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) |
753 | return; | 753 | return; |
754 | 754 | ||
755 | dd_cbfunc = MptDeviceDriverHandlers[cb_idx]; | 755 | dd_cbfunc = MptDeviceDriverHandlers[cb_idx]; |
@@ -1681,7 +1681,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1681 | } | 1681 | } |
1682 | 1682 | ||
1683 | /* call per device driver probe entry point */ | 1683 | /* call per device driver probe entry point */ |
1684 | for(cb_idx=0; cb_idx<MPT_MAX_PROTOCOL_DRIVERS; cb_idx++) { | 1684 | for(cb_idx = 0; cb_idx < MPT_MAX_PROTOCOL_DRIVERS; cb_idx++) { |
1685 | if(MptDeviceDriverHandlers[cb_idx] && | 1685 | if(MptDeviceDriverHandlers[cb_idx] && |
1686 | MptDeviceDriverHandlers[cb_idx]->probe) { | 1686 | MptDeviceDriverHandlers[cb_idx]->probe) { |
1687 | MptDeviceDriverHandlers[cb_idx]->probe(pdev,id); | 1687 | MptDeviceDriverHandlers[cb_idx]->probe(pdev,id); |
@@ -1731,7 +1731,7 @@ mpt_detach(struct pci_dev *pdev) | |||
1731 | remove_proc_entry(pname, NULL); | 1731 | remove_proc_entry(pname, NULL); |
1732 | 1732 | ||
1733 | /* call per device driver remove entry point */ | 1733 | /* call per device driver remove entry point */ |
1734 | for(cb_idx=0; cb_idx<MPT_MAX_PROTOCOL_DRIVERS; cb_idx++) { | 1734 | for(cb_idx = 0; cb_idx < MPT_MAX_PROTOCOL_DRIVERS; cb_idx++) { |
1735 | if(MptDeviceDriverHandlers[cb_idx] && | 1735 | if(MptDeviceDriverHandlers[cb_idx] && |
1736 | MptDeviceDriverHandlers[cb_idx]->remove) { | 1736 | MptDeviceDriverHandlers[cb_idx]->remove) { |
1737 | MptDeviceDriverHandlers[cb_idx]->remove(pdev); | 1737 | MptDeviceDriverHandlers[cb_idx]->remove(pdev); |
@@ -5933,7 +5933,7 @@ procmpt_version_read(char *buf, char **start, off_t offset, int request, int *eo | |||
5933 | len += sprintf(buf+len, " Fusion MPT base driver\n"); | 5933 | len += sprintf(buf+len, " Fusion MPT base driver\n"); |
5934 | 5934 | ||
5935 | scsi = fc = sas = lan = ctl = targ = dmp = 0; | 5935 | scsi = fc = sas = lan = ctl = targ = dmp = 0; |
5936 | for (cb_idx=MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) { | 5936 | for (cb_idx = MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) { |
5937 | drvname = NULL; | 5937 | drvname = NULL; |
5938 | if (MptCallbacks[cb_idx]) { | 5938 | if (MptCallbacks[cb_idx]) { |
5939 | switch (MptDriverClass[cb_idx]) { | 5939 | switch (MptDriverClass[cb_idx]) { |
@@ -6676,7 +6676,7 @@ ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply | |||
6676 | /* | 6676 | /* |
6677 | * Call each currently registered protocol event handler. | 6677 | * Call each currently registered protocol event handler. |
6678 | */ | 6678 | */ |
6679 | for (cb_idx=MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) { | 6679 | for (cb_idx = MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) { |
6680 | if (MptEvHandlers[cb_idx]) { | 6680 | if (MptEvHandlers[cb_idx]) { |
6681 | devtverboseprintk(ioc, printk(MYIOC_s_DEBUG_FMT "Routing Event to event handler #%d\n", | 6681 | devtverboseprintk(ioc, printk(MYIOC_s_DEBUG_FMT "Routing Event to event handler #%d\n", |
6682 | ioc->name, cb_idx)); | 6682 | ioc->name, cb_idx)); |