projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
[powerpc.git]
/
drivers
/
block
/
acsi_slm.c
diff --git
a/drivers/block/acsi_slm.c
b/drivers/block/acsi_slm.c
index
4030a8f
..
1d9d9b4
100644
(file)
--- a/
drivers/block/acsi_slm.c
+++ b/
drivers/block/acsi_slm.c
@@
-65,7
+65,6
@@
not be guaranteed. There are several ways to assure this:
#include <linux/time.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/mm.h>
#include <linux/slab.h>
-#include <linux/smp_lock.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/system.h>
@@
-246,7
+245,7
@@
static int slm_getstats( char *buffer, int device );
static ssize_t slm_read( struct file* file, char *buf, size_t count, loff_t
*ppos );
static void start_print( int device );
static ssize_t slm_read( struct file* file, char *buf, size_t count, loff_t
*ppos );
static void start_print( int device );
-static irqreturn_t slm_interrupt(int irc, void *data
, struct pt_regs *fp
);
+static irqreturn_t slm_interrupt(int irc, void *data);
static void slm_test_ready( unsigned long dummy );
static void set_dma_addr( unsigned long paddr );
static unsigned long get_dma_addr( void );
static void slm_test_ready( unsigned long dummy );
static void set_dma_addr( unsigned long paddr );
static unsigned long get_dma_addr( void );
@@
-269,7
+268,7
@@
static int slm_get_pagesize( int device, int *w, int *h );
static DEFINE_TIMER(slm_timer, slm_test_ready, 0, 0);
static DEFINE_TIMER(slm_timer, slm_test_ready, 0, 0);
-static struct file_operations slm_fops = {
+static
const
struct file_operations slm_fops = {
.owner = THIS_MODULE,
.read = slm_read,
.write = slm_write,
.owner = THIS_MODULE,
.read = slm_read,
.write = slm_write,
@@
-363,7
+362,7
@@
static ssize_t slm_read( struct file *file, char *buf, size_t count,
loff_t *ppos )
{
loff_t *ppos )
{
- struct inode *node = file->f_dentry->d_inode;
+ struct inode *node = file->f_
path.
dentry->d_inode;
unsigned long page;
int length;
int end;
unsigned long page;
int length;
int end;
@@
-452,7
+451,7
@@
static void start_print( int device )
/* Only called when an error happened or at the end of a page */
/* Only called when an error happened or at the end of a page */
-static irqreturn_t slm_interrupt(int irc, void *data
, struct pt_regs *fp
)
+static irqreturn_t slm_interrupt(int irc, void *data)
{ unsigned long addr;
int stat;
{ unsigned long addr;
int stat;
@@
-618,7
+617,7
@@
static ssize_t slm_write( struct file *file, const char *buf, size_t count,
loff_t *ppos )
{
loff_t *ppos )
{
- struct inode *node = file->f_dentry->d_inode;
+ struct inode *node = file->f_
path.
dentry->d_inode;
int device = iminor(node);
int n, filled, w, h;
int device = iminor(node);
int n, filled, w, h;