projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
staging: ion: ion_cma_heap: Don't directly use dma_common_get_sgtable
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
char
/
ppdev.c
diff --git
a/drivers/char/ppdev.c
b/drivers/char/ppdev.c
index 1cd49241e60eb5024ac2941a5b0787fa46f7c13e..ae0b42b66e55e80405a91a6ad3783ab2f157bd48 100644
(file)
--- a/
drivers/char/ppdev.c
+++ b/
drivers/char/ppdev.c
@@
-107,7
+107,7
@@
static inline void pp_enable_irq (struct pp_struct *pp)
static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
loff_t * ppos)
{
static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
loff_t * ppos)
{
- unsigned int minor = iminor(file
->f_path.dentry->d_inode
);
+ unsigned int minor = iminor(file
_inode(file)
);
struct pp_struct *pp = file->private_data;
char * kbuffer;
ssize_t bytes_read = 0;
struct pp_struct *pp = file->private_data;
char * kbuffer;
ssize_t bytes_read = 0;
@@
-189,7
+189,7
@@
static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
static ssize_t pp_write (struct file * file, const char __user * buf,
size_t count, loff_t * ppos)
{
static ssize_t pp_write (struct file * file, const char __user * buf,
size_t count, loff_t * ppos)
{
- unsigned int minor = iminor(file
->f_path.dentry->d_inode
);
+ unsigned int minor = iminor(file
_inode(file)
);
struct pp_struct *pp = file->private_data;
char * kbuffer;
ssize_t bytes_written = 0;
struct pp_struct *pp = file->private_data;
char * kbuffer;
ssize_t bytes_written = 0;
@@
-324,7
+324,7
@@
static enum ieee1284_phase init_phase (int mode)
static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- unsigned int minor = iminor(file
->f_path.dentry->d_inode
);
+ unsigned int minor = iminor(file
_inode(file)
);
struct pp_struct *pp = file->private_data;
struct parport * port;
void __user *argp = (void __user *)arg;
struct pp_struct *pp = file->private_data;
struct parport * port;
void __user *argp = (void __user *)arg;