git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
message
/
fusion
/
mptspi.c
diff --git
a/drivers/message/fusion/mptspi.c
b/drivers/message/fusion/mptspi.c
index
e4cc3dd
..
203c661
100644
(file)
--- a/
drivers/message/fusion/mptspi.c
+++ b/
drivers/message/fusion/mptspi.c
@@
-3,7
+3,7
@@
* For use with LSI Logic PCI chip/adapter(s)
* running LSI Logic Fusion MPT (Message Passing Technology) firmware.
*
* For use with LSI Logic PCI chip/adapter(s)
* running LSI Logic Fusion MPT (Message Passing Technology) firmware.
*
- * Copyright (c) 1999-200
5
LSI Logic Corporation
+ * Copyright (c) 1999-200
7
LSI Logic Corporation
* (mailto:mpt_linux_developer@lsil.com)
*
*/
* (mailto:mpt_linux_developer@lsil.com)
*
*/
@@
-77,6
+77,7
@@
MODULE_AUTHOR(MODULEAUTHOR);
MODULE_DESCRIPTION(my_NAME);
MODULE_LICENSE("GPL");
MODULE_AUTHOR(MODULEAUTHOR);
MODULE_DESCRIPTION(my_NAME);
MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
/* Command line args */
static int mpt_saf_te = MPTSCSIH_SAF_TE;
/* Command line args */
static int mpt_saf_te = MPTSCSIH_SAF_TE;
@@
-646,9
+647,10
@@
struct work_queue_wrapper {
int disk;
};
int disk;
};
-static void mpt_work_wrapper(
void *data
)
+static void mpt_work_wrapper(
struct work_struct *work
)
{
{
- struct work_queue_wrapper *wqw = (struct work_queue_wrapper *)data;
+ struct work_queue_wrapper *wqw =
+ container_of(work, struct work_queue_wrapper, work);
struct _MPT_SCSI_HOST *hd = wqw->hd;
struct Scsi_Host *shost = hd->ioc->sh;
struct scsi_device *sdev;
struct _MPT_SCSI_HOST *hd = wqw->hd;
struct Scsi_Host *shost = hd->ioc->sh;
struct scsi_device *sdev;
@@
-695,7
+697,7
@@
static void mpt_dv_raid(struct _MPT_SCSI_HOST *hd, int disk)
disk);
return;
}
disk);
return;
}
- INIT_WORK(&wqw->work, mpt_work_wrapper
, wqw
);
+ INIT_WORK(&wqw->work, mpt_work_wrapper);
wqw->hd = hd;
wqw->disk = disk;
wqw->hd = hd;
wqw->disk = disk;
@@
-784,9
+786,10
@@
MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
* renegotiate for a given target
*/
static void
* renegotiate for a given target
*/
static void
-mptspi_dv_renegotiate_work(
void *data
)
+mptspi_dv_renegotiate_work(
struct work_struct *work
)
{
{
- struct work_queue_wrapper *wqw = (struct work_queue_wrapper *)data;
+ struct work_queue_wrapper *wqw =
+ container_of(work, struct work_queue_wrapper, work);
struct _MPT_SCSI_HOST *hd = wqw->hd;
struct scsi_device *sdev;
struct _MPT_SCSI_HOST *hd = wqw->hd;
struct scsi_device *sdev;
@@
-804,7
+807,7
@@
mptspi_dv_renegotiate(struct _MPT_SCSI_HOST *hd)
if (!wqw)
return;
if (!wqw)
return;
- INIT_WORK(&wqw->work, mptspi_dv_renegotiate_work
, wqw
);
+ INIT_WORK(&wqw->work, mptspi_dv_renegotiate_work);
wqw->hd = hd;
schedule_work(&wqw->work);
wqw->hd = hd;
schedule_work(&wqw->work);
@@
-1098,8
+1101,7
@@
static struct pci_driver mptspi_driver = {
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/**
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/**
- * mptspi_init - Register MPT adapter(s) as SCSI host(s) with
- * linux scsi mid-layer.
+ * mptspi_init - Register MPT adapter(s) as SCSI host(s) with SCSI mid-layer.
*
* Returns 0 for success, non-zero for failure.
*/
*
* Returns 0 for success, non-zero for failure.
*/
@@
-1133,7
+1135,6
@@
mptspi_init(void)
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/**
* mptspi_exit - Unregisters MPT adapter(s)
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/**
* mptspi_exit - Unregisters MPT adapter(s)
- *
*/
static void __exit
mptspi_exit(void)
*/
static void __exit
mptspi_exit(void)