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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
arm
/
eesox.c
diff --git
a/drivers/scsi/arm/eesox.c
b/drivers/scsi/arm/eesox.c
index
78b7e54
..
3f876fb
100644
(file)
--- a/
drivers/scsi/arm/eesox.c
+++ b/
drivers/scsi/arm/eesox.c
@@
-35,7
+35,6
@@
#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <linux/dma-mapping.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include <asm/dma.h>
#include <asm/ecard.h>
#include <asm/pgtable.h>
#include <asm/dma.h>
#include <asm/ecard.h>
#include <asm/pgtable.h>
@@
-139,10
+138,9
@@
eesoxscsi_terminator_ctl(struct Scsi_Host *host, int on_off)
* Purpose : handle interrupts from EESOX SCSI card
* Params : irq - interrupt number
* dev_id - user-defined (Scsi_Host structure)
* Purpose : handle interrupts from EESOX SCSI card
* Params : irq - interrupt number
* dev_id - user-defined (Scsi_Host structure)
- * regs - processor registers at interrupt
*/
static irqreturn_t
*/
static irqreturn_t
-eesoxscsi_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+eesoxscsi_intr(int irq, void *dev_id)
{
struct eesoxscsi_info *info = dev_id;
{
struct eesoxscsi_info *info = dev_id;
@@
-158,7
+156,7
@@
eesoxscsi_intr(int irq, void *dev_id, struct pt_regs *regs)
* Returns : type of transfer to be performed
*/
static fasdmatype_t
* Returns : type of transfer to be performed
*/
static fasdmatype_t
-eesoxscsi_dma_setup(struct Scsi_Host *host,
Scsi_P
ointer *SCp,
+eesoxscsi_dma_setup(struct Scsi_Host *host,
struct scsi_p
ointer *SCp,
fasdmadir_t direction, fasdmatype_t min_type)
{
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
fasdmadir_t direction, fasdmatype_t min_type)
{
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
@@
-353,7
+351,7
@@
static void eesoxscsi_buffer_out(void *buf, int length, void __iomem *base)
}
static void
}
static void
-eesoxscsi_dma_pseudo(struct Scsi_Host *host,
Scsi_P
ointer *SCp,
+eesoxscsi_dma_pseudo(struct Scsi_Host *host,
struct scsi_p
ointer *SCp,
fasdmadir_t dir, int transfer_size)
{
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
fasdmadir_t dir, int transfer_size)
{
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
@@
-370,7
+368,7
@@
eesoxscsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
* SCpnt - command
*/
static void
* SCpnt - command
*/
static void
-eesoxscsi_dma_stop(struct Scsi_Host *host,
Scsi_P
ointer *SCp)
+eesoxscsi_dma_stop(struct Scsi_Host *host,
struct scsi_p
ointer *SCp)
{
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
if (info->info.scsi.dma != NO_DMA)
{
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
if (info->info.scsi.dma != NO_DMA)
@@
-466,7
+464,7
@@
int eesoxscsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_
return pos;
}
return pos;
}
-static ssize_t eesoxscsi_show_term(struct device *dev, char *buf)
+static ssize_t eesoxscsi_show_term(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct expansion_card *ec = ECARD_DEV(dev);
struct Scsi_Host *host = ecard_get_drvdata(ec);
{
struct expansion_card *ec = ECARD_DEV(dev);
struct Scsi_Host *host = ecard_get_drvdata(ec);
@@
-475,7
+473,7
@@
static ssize_t eesoxscsi_show_term(struct device *dev, char *buf)
return sprintf(buf, "%d\n", info->control & EESOX_TERM_ENABLE ? 1 : 0);
}
return sprintf(buf, "%d\n", info->control & EESOX_TERM_ENABLE ? 1 : 0);
}
-static ssize_t eesoxscsi_store_term(struct device *dev, const char *buf, size_t len)
+static ssize_t eesoxscsi_store_term(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
struct expansion_card *ec = ECARD_DEV(dev);
struct Scsi_Host *host = ecard_get_drvdata(ec);
{
struct expansion_card *ec = ECARD_DEV(dev);
struct Scsi_Host *host = ecard_get_drvdata(ec);
@@
-499,7
+497,7
@@
static ssize_t eesoxscsi_store_term(struct device *dev, const char *buf, size_t
static DEVICE_ATTR(bus_term, S_IRUGO | S_IWUSR,
eesoxscsi_show_term, eesoxscsi_store_term);
static DEVICE_ATTR(bus_term, S_IRUGO | S_IWUSR,
eesoxscsi_show_term, eesoxscsi_store_term);
-static
Scsi_Host_T
emplate eesox_template = {
+static
struct scsi_host_t
emplate eesox_template = {
.module = THIS_MODULE,
.proc_info = eesoxscsi_proc_info,
.name = "EESOX SCSI",
.module = THIS_MODULE,
.proc_info = eesoxscsi_proc_info,
.name = "EESOX SCSI",
@@
-675,6
+673,6
@@
module_exit(eesox_exit);
MODULE_AUTHOR("Russell King");
MODULE_DESCRIPTION("EESOX 'Fast' SCSI driver for Acorn machines");
MODULE_AUTHOR("Russell King");
MODULE_DESCRIPTION("EESOX 'Fast' SCSI driver for Acorn machines");
-
MODULE_PARM(term, "1-8i"
);
+
module_param_array(term, int, NULL, 0
);
MODULE_PARM_DESC(term, "SCSI bus termination");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(term, "SCSI bus termination");
MODULE_LICENSE("GPL");