diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:48 -0500 |
commit | b4d1ab58c016f4dffef4ff1eb392fa84e3c35024 (patch) | |
tree | 95229900a5bd022f89ec9a4268a5541808dbb119 /arch/powerpc/kernel/rtas_flash.c | |
parent | 40fad04b224db982cce5f6226ebe3ceb6529b781 (diff) |
[PATCH] struct path: convert powerpc
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/powerpc/kernel/rtas_flash.c')
-rw-r--r-- | arch/powerpc/kernel/rtas_flash.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c index 7d0f13fecc0e..0c4fcd34bfe5 100644 --- a/arch/powerpc/kernel/rtas_flash.c +++ b/arch/powerpc/kernel/rtas_flash.c | |||
@@ -193,7 +193,7 @@ static void free_flash_list(struct flash_block_list *f) | |||
193 | 193 | ||
194 | static int rtas_flash_release(struct inode *inode, struct file *file) | 194 | static int rtas_flash_release(struct inode *inode, struct file *file) |
195 | { | 195 | { |
196 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 196 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
197 | struct rtas_update_flash_t *uf; | 197 | struct rtas_update_flash_t *uf; |
198 | 198 | ||
199 | uf = (struct rtas_update_flash_t *) dp->data; | 199 | uf = (struct rtas_update_flash_t *) dp->data; |
@@ -255,7 +255,7 @@ static void get_flash_status_msg(int status, char *buf) | |||
255 | static ssize_t rtas_flash_read(struct file *file, char __user *buf, | 255 | static ssize_t rtas_flash_read(struct file *file, char __user *buf, |
256 | size_t count, loff_t *ppos) | 256 | size_t count, loff_t *ppos) |
257 | { | 257 | { |
258 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 258 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
259 | struct rtas_update_flash_t *uf; | 259 | struct rtas_update_flash_t *uf; |
260 | char msg[RTAS_MSG_MAXLEN]; | 260 | char msg[RTAS_MSG_MAXLEN]; |
261 | int msglen; | 261 | int msglen; |
@@ -299,7 +299,7 @@ void rtas_block_ctor(void *ptr, struct kmem_cache *cache, unsigned long flags) | |||
299 | static ssize_t rtas_flash_write(struct file *file, const char __user *buffer, | 299 | static ssize_t rtas_flash_write(struct file *file, const char __user *buffer, |
300 | size_t count, loff_t *off) | 300 | size_t count, loff_t *off) |
301 | { | 301 | { |
302 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 302 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
303 | struct rtas_update_flash_t *uf; | 303 | struct rtas_update_flash_t *uf; |
304 | char *p; | 304 | char *p; |
305 | int next_free; | 305 | int next_free; |
@@ -391,7 +391,7 @@ static void manage_flash(struct rtas_manage_flash_t *args_buf) | |||
391 | static ssize_t manage_flash_read(struct file *file, char __user *buf, | 391 | static ssize_t manage_flash_read(struct file *file, char __user *buf, |
392 | size_t count, loff_t *ppos) | 392 | size_t count, loff_t *ppos) |
393 | { | 393 | { |
394 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 394 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
395 | struct rtas_manage_flash_t *args_buf; | 395 | struct rtas_manage_flash_t *args_buf; |
396 | char msg[RTAS_MSG_MAXLEN]; | 396 | char msg[RTAS_MSG_MAXLEN]; |
397 | int msglen; | 397 | int msglen; |
@@ -421,7 +421,7 @@ static ssize_t manage_flash_read(struct file *file, char __user *buf, | |||
421 | static ssize_t manage_flash_write(struct file *file, const char __user *buf, | 421 | static ssize_t manage_flash_write(struct file *file, const char __user *buf, |
422 | size_t count, loff_t *off) | 422 | size_t count, loff_t *off) |
423 | { | 423 | { |
424 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 424 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
425 | struct rtas_manage_flash_t *args_buf; | 425 | struct rtas_manage_flash_t *args_buf; |
426 | const char reject_str[] = "0"; | 426 | const char reject_str[] = "0"; |
427 | const char commit_str[] = "1"; | 427 | const char commit_str[] = "1"; |
@@ -492,7 +492,7 @@ static int get_validate_flash_msg(struct rtas_validate_flash_t *args_buf, | |||
492 | static ssize_t validate_flash_read(struct file *file, char __user *buf, | 492 | static ssize_t validate_flash_read(struct file *file, char __user *buf, |
493 | size_t count, loff_t *ppos) | 493 | size_t count, loff_t *ppos) |
494 | { | 494 | { |
495 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 495 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
496 | struct rtas_validate_flash_t *args_buf; | 496 | struct rtas_validate_flash_t *args_buf; |
497 | char msg[RTAS_MSG_MAXLEN]; | 497 | char msg[RTAS_MSG_MAXLEN]; |
498 | int msglen; | 498 | int msglen; |
@@ -520,7 +520,7 @@ static ssize_t validate_flash_read(struct file *file, char __user *buf, | |||
520 | static ssize_t validate_flash_write(struct file *file, const char __user *buf, | 520 | static ssize_t validate_flash_write(struct file *file, const char __user *buf, |
521 | size_t count, loff_t *off) | 521 | size_t count, loff_t *off) |
522 | { | 522 | { |
523 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 523 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
524 | struct rtas_validate_flash_t *args_buf; | 524 | struct rtas_validate_flash_t *args_buf; |
525 | int rc; | 525 | int rc; |
526 | 526 | ||
@@ -569,7 +569,7 @@ done: | |||
569 | 569 | ||
570 | static int validate_flash_release(struct inode *inode, struct file *file) | 570 | static int validate_flash_release(struct inode *inode, struct file *file) |
571 | { | 571 | { |
572 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 572 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
573 | struct rtas_validate_flash_t *args_buf; | 573 | struct rtas_validate_flash_t *args_buf; |
574 | 574 | ||
575 | args_buf = (struct rtas_validate_flash_t *) dp->data; | 575 | args_buf = (struct rtas_validate_flash_t *) dp->data; |