Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a7113a966241b700aecc7b8cb326cecb62e3c4b2

Authored by Josef Sipek
Committed by Linus Torvalds
1 parent 6c648be6f4
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] struct path: convert char-drivers 

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>

Showing 18 changed files with 41 additions and 41 deletions Side-by-side Diff

drivers/char/cs5535_gpio.c
Diff comments   View file @ a7113a9
... ... @@ -82,7 +82,7 @@
82 82 static ssize_t cs5535_gpio_write(struct file *file, const char __user *data,
83 83 size_t len, loff_t *ppos)
84 84 {
85   - u32 m = iminor(file->f_dentry->d_inode);
  85 + u32 m = iminor(file->f_path.dentry->d_inode);
86 86 int i, j;
87 87 u32 base = gpio_base + cs5535_lowhigh_base(m);
88 88 u32 m0, m1;
... ... @@ -117,7 +117,7 @@
117 117 static ssize_t cs5535_gpio_read(struct file *file, char __user *buf,
118 118 size_t len, loff_t *ppos)
119 119 {
120   - u32 m = iminor(file->f_dentry->d_inode);
  120 + u32 m = iminor(file->f_path.dentry->d_inode);
121 121 u32 base = gpio_base + cs5535_lowhigh_base(m);
122 122 int rd_bit = 1 << (m & 0x0f);
123 123 int i;
drivers/char/dsp56k.c
Diff comments   View file @ a7113a9
... ... @@ -201,7 +201,7 @@
201 201 static ssize_t dsp56k_read(struct file *file, char __user *buf, size_t count,
202 202 loff_t *ppos)
203 203 {
204   - struct inode *inode = file->f_dentry->d_inode;
  204 + struct inode *inode = file->f_path.dentry->d_inode;
205 205 int dev = iminor(inode) & 0x0f;
206 206  
207 207 switch(dev)
... ... @@ -264,7 +264,7 @@
264 264 static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t count,
265 265 loff_t *ppos)
266 266 {
267   - struct inode *inode = file->f_dentry->d_inode;
  267 + struct inode *inode = file->f_path.dentry->d_inode;
268 268 int dev = iminor(inode) & 0x0f;
269 269  
270 270 switch(dev)
... ... @@ -420,7 +420,7 @@
420 420 #if 0
421 421 static unsigned int dsp56k_poll(struct file *file, poll_table *wait)
422 422 {
423   - int dev = iminor(file->f_dentry->d_inode) & 0x0f;
  423 + int dev = iminor(file->f_path.dentry->d_inode) & 0x0f;
424 424  
425 425 switch(dev)
426 426 {
... ... @@ -122,7 +122,7 @@
122 122 static ssize_t dtlk_read(struct file *file, char __user *buf,
123 123 size_t count, loff_t * ppos)
124 124 {
125   - unsigned int minor = iminor(file->f_dentry->d_inode);
  125 + unsigned int minor = iminor(file->f_path.dentry->d_inode);
126 126 char ch;
127 127 int i = 0, retries;
128 128  
... ... @@ -174,7 +174,7 @@
174 174 }
175 175 #endif
176 176  
177   - if (iminor(file->f_dentry->d_inode) != DTLK_MINOR)
  177 + if (iminor(file->f_path.dentry->d_inode) != DTLK_MINOR)
178 178 return -EINVAL;
179 179  
180 180 while (1) {
drivers/char/ip2/ip2main.c
Diff comments   View file @ a7113a9
... ... @@ -2700,7 +2700,7 @@
2700 2700 ssize_t
2701 2701 ip2_ipl_read(struct file *pFile, char __user *pData, size_t count, loff_t *off )
2702 2702 {
2703   - unsigned int minor = iminor(pFile->f_dentry->d_inode);
  2703 + unsigned int minor = iminor(pFile->f_path.dentry->d_inode);
2704 2704 int rc = 0;
2705 2705  
2706 2706 #ifdef IP2DEBUG_IPL
drivers/char/istallion.c
Diff comments   View file @ a7113a9
... ... @@ -4194,7 +4194,7 @@
4194 4194 void *p;
4195 4195 loff_t off = *offp;
4196 4196  
4197   - brdnr = iminor(fp->f_dentry->d_inode);
  4197 + brdnr = iminor(fp->f_path.dentry->d_inode);
4198 4198 if (brdnr >= stli_nrbrds)
4199 4199 return -ENODEV;
4200 4200 brdp = stli_brds[brdnr];
... ... @@ -4258,7 +4258,7 @@
4258 4258 void *p;
4259 4259 loff_t off = *offp;
4260 4260  
4261   - brdnr = iminor(fp->f_dentry->d_inode);
  4261 + brdnr = iminor(fp->f_path.dentry->d_inode);
4262 4262  
4263 4263 if (brdnr >= stli_nrbrds)
4264 4264 return -ENODEV;
... ... @@ -296,7 +296,7 @@
296 296 static ssize_t lp_write(struct file * file, const char __user * buf,
297 297 size_t count, loff_t *ppos)
298 298 {
299   - unsigned int minor = iminor(file->f_dentry->d_inode);
  299 + unsigned int minor = iminor(file->f_path.dentry->d_inode);
300 300 struct parport *port = lp_table[minor].dev->port;
301 301 char *kbuf = lp_table[minor].lp_buffer;
302 302 ssize_t retv = 0;
... ... @@ -415,7 +415,7 @@
415 415 size_t count, loff_t *ppos)
416 416 {
417 417 DEFINE_WAIT(wait);
418   - unsigned int minor=iminor(file->f_dentry->d_inode);
  418 + unsigned int minor=iminor(file->f_path.dentry->d_inode);
419 419 struct parport *port = lp_table[minor].dev->port;
420 420 ssize_t retval = 0;
421 421 char *kbuf = lp_table[minor].lp_buffer;
... ... @@ -774,7 +774,7 @@
774 774 {
775 775 loff_t ret;
776 776  
777   - mutex_lock(&file->f_dentry->d_inode->i_mutex);
  777 + mutex_lock(&file->f_path.dentry->d_inode->i_mutex);
778 778 switch (orig) {
779 779 case 0:
780 780 file->f_pos = offset;
... ... @@ -789,7 +789,7 @@
789 789 default:
790 790 ret = -EINVAL;
791 791 }
792   - mutex_unlock(&file->f_dentry->d_inode->i_mutex);
  792 + mutex_unlock(&file->f_path.dentry->d_inode->i_mutex);
793 793 return ret;
794 794 }
795 795  
drivers/char/nsc_gpio.c
Diff comments   View file @ a7113a9
... ... @@ -41,7 +41,7 @@
41 41 ssize_t nsc_gpio_write(struct file *file, const char __user *data,
42 42 size_t len, loff_t *ppos)
43 43 {
44   - unsigned m = iminor(file->f_dentry->d_inode);
  44 + unsigned m = iminor(file->f_path.dentry->d_inode);
45 45 struct nsc_gpio_ops *amp = file->private_data;
46 46 struct device *dev = amp->dev;
47 47 size_t i;
... ... @@ -104,7 +104,7 @@
104 104 ssize_t nsc_gpio_read(struct file *file, char __user * buf,
105 105 size_t len, loff_t * ppos)
106 106 {
107   - unsigned m = iminor(file->f_dentry->d_inode);
  107 + unsigned m = iminor(file->f_path.dentry->d_inode);
108 108 int value;
109 109 struct nsc_gpio_ops *amp = file->private_data;
110 110  
drivers/char/ppdev.c
Diff comments   View file @ a7113a9
... ... @@ -106,7 +106,7 @@
106 106 static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
107 107 loff_t * ppos)
108 108 {
109   - unsigned int minor = iminor(file->f_dentry->d_inode);
  109 + unsigned int minor = iminor(file->f_path.dentry->d_inode);
110 110 struct pp_struct *pp = file->private_data;
111 111 char * kbuffer;
112 112 ssize_t bytes_read = 0;
... ... @@ -189,7 +189,7 @@
189 189 static ssize_t pp_write (struct file * file, const char __user * buf,
190 190 size_t count, loff_t * ppos)
191 191 {
192   - unsigned int minor = iminor(file->f_dentry->d_inode);
  192 + unsigned int minor = iminor(file->f_path.dentry->d_inode);
193 193 struct pp_struct *pp = file->private_data;
194 194 char * kbuffer;
195 195 ssize_t bytes_written = 0;
drivers/char/random.c
Diff comments   View file @ a7113a9
... ... @@ -1048,7 +1048,7 @@
1048 1048 if (p == buffer) {
1049 1049 return (ssize_t)ret;
1050 1050 } else {
1051   - struct inode *inode = file->f_dentry->d_inode;
  1051 + struct inode *inode = file->f_path.dentry->d_inode;
1052 1052 inode->i_mtime = current_fs_time(inode->i_sb);
1053 1053 mark_inode_dirty(inode);
1054 1054 return (ssize_t)(p - buffer);
... ... @@ -75,7 +75,7 @@
75 75 filp->f_flags |= O_DIRECT;
76 76 filp->f_mapping = bdev->bd_inode->i_mapping;
77 77 if (++raw_devices[minor].inuse == 1)
78   - filp->f_dentry->d_inode->i_mapping =
  78 + filp->f_path.dentry->d_inode->i_mapping =
79 79 bdev->bd_inode->i_mapping;
80 80 filp->private_data = bdev;
81 81 mutex_unlock(&raw_mutex);
drivers/char/sonypi.c
Diff comments   View file @ a7113a9
... ... @@ -979,7 +979,7 @@
979 979 }
980 980  
981 981 if (ret > 0) {
982   - struct inode *inode = file->f_dentry->d_inode;
  982 + struct inode *inode = file->f_path.dentry->d_inode;
983 983 inode->i_atime = current_fs_time(inode->i_sb);
984 984 }
985 985  
drivers/char/tb0219.c
Diff comments   View file @ a7113a9
... ... @@ -164,7 +164,7 @@
164 164 unsigned int minor;
165 165 char value;
166 166  
167   - minor = iminor(file->f_dentry->d_inode);
  167 + minor = iminor(file->f_path.dentry->d_inode);
168 168 switch (minor) {
169 169 case 0:
170 170 value = get_led();
... ... @@ -200,7 +200,7 @@
200 200 int retval = 0;
201 201 char c;
202 202  
203   - minor = iminor(file->f_dentry->d_inode);
  203 + minor = iminor(file->f_path.dentry->d_inode);
204 204 switch (minor) {
205 205 case 0:
206 206 type = TYPE_LED;
drivers/char/tipar.c
Diff comments   View file @ a7113a9
... ... @@ -285,7 +285,7 @@
285 285 tipar_write (struct file *file, const char __user *buf, size_t count,
286 286 loff_t * ppos)
287 287 {
288   - unsigned int minor = iminor(file->f_dentry->d_inode) - TIPAR_MINOR;
  288 + unsigned int minor = iminor(file->f_path.dentry->d_inode) - TIPAR_MINOR;
289 289 ssize_t n;
290 290  
291 291 parport_claim_or_block(table[minor].dev);
... ... @@ -313,7 +313,7 @@
313 313 tipar_read(struct file *file, char __user *buf, size_t count, loff_t * ppos)
314 314 {
315 315 int b = 0;
316   - unsigned int minor = iminor(file->f_dentry->d_inode) - TIPAR_MINOR;
  316 + unsigned int minor = iminor(file->f_path.dentry->d_inode) - TIPAR_MINOR;
317 317 ssize_t retval = 0;
318 318 ssize_t n = 0;
319 319  
drivers/char/tty_io.c
Diff comments   View file @ a7113a9
... ... @@ -1629,7 +1629,7 @@
1629 1629 struct tty_ldisc *ld;
1630 1630  
1631 1631 tty = (struct tty_struct *)file->private_data;
1632   - inode = file->f_dentry->d_inode;
  1632 + inode = file->f_path.dentry->d_inode;
1633 1633 if (tty_paranoia_check(tty, inode, "tty_read"))
1634 1634 return -EIO;
1635 1635 if (!tty || (test_bit(TTY_IO_ERROR, &tty->flags)))
... ... @@ -1732,7 +1732,7 @@
1732 1732 cond_resched();
1733 1733 }
1734 1734 if (written) {
1735   - struct inode *inode = file->f_dentry->d_inode;
  1735 + struct inode *inode = file->f_path.dentry->d_inode;
1736 1736 inode->i_mtime = current_fs_time(inode->i_sb);
1737 1737 ret = written;
1738 1738 }
... ... @@ -1763,7 +1763,7 @@
1763 1763 loff_t *ppos)
1764 1764 {
1765 1765 struct tty_struct * tty;
1766   - struct inode *inode = file->f_dentry->d_inode;
  1766 + struct inode *inode = file->f_path.dentry->d_inode;
1767 1767 ssize_t ret;
1768 1768 struct tty_ldisc *ld;
1769 1769  
... ... @@ -2170,7 +2170,7 @@
2170 2170 unsigned long flags;
2171 2171  
2172 2172 tty = (struct tty_struct *)filp->private_data;
2173   - if (tty_paranoia_check(tty, filp->f_dentry->d_inode, "release_dev"))
  2173 + if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "release_dev"))
2174 2174 return;
2175 2175  
2176 2176 check_tty_count(tty, "release_dev");
... ... @@ -2680,7 +2680,7 @@
2680 2680 int ret = 0;
2681 2681  
2682 2682 tty = (struct tty_struct *)filp->private_data;
2683   - if (tty_paranoia_check(tty, filp->f_dentry->d_inode, "tty_poll"))
  2683 + if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_poll"))
2684 2684 return 0;
2685 2685  
2686 2686 ld = tty_ldisc_ref_wait(tty);
... ... @@ -2696,7 +2696,7 @@
2696 2696 int retval;
2697 2697  
2698 2698 tty = (struct tty_struct *)filp->private_data;
2699   - if (tty_paranoia_check(tty, filp->f_dentry->d_inode, "tty_fasync"))
  2699 + if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync"))
2700 2700 return 0;
2701 2701  
2702 2702 retval = fasync_helper(fd, filp, on, &tty->fasync);
drivers/char/vc_screen.c
Diff comments   View file @ a7113a9
... ... @@ -72,7 +72,7 @@
72 72 int size;
73 73  
74 74 down(&con_buf_sem);
75   - size = vcs_size(file->f_dentry->d_inode);
  75 + size = vcs_size(file->f_path.dentry->d_inode);
76 76 switch (orig) {
77 77 default:
78 78 up(&con_buf_sem);
... ... @@ -98,7 +98,7 @@
98 98 static ssize_t
99 99 vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
100 100 {
101   - struct inode *inode = file->f_dentry->d_inode;
  101 + struct inode *inode = file->f_path.dentry->d_inode;
102 102 unsigned int currcons = iminor(inode);
103 103 struct vc_data *vc;
104 104 long pos;
... ... @@ -271,7 +271,7 @@
271 271 static ssize_t
272 272 vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
273 273 {
274   - struct inode *inode = file->f_dentry->d_inode;
  274 + struct inode *inode = file->f_path.dentry->d_inode;
275 275 unsigned int currcons = iminor(inode);
276 276 struct vc_data *vc;
277 277 long pos;
drivers/char/viotape.c
Diff comments   View file @ a7113a9
... ... @@ -442,7 +442,7 @@
442 442 if (op == NULL)
443 443 return -ENOMEM;
444 444  
445   - get_dev_info(file->f_dentry->d_inode, &devi);
  445 + get_dev_info(file->f_path.dentry->d_inode, &devi);
446 446  
447 447 /*
448 448 * We need to make sure we can send a request. We use
... ... @@ -532,7 +532,7 @@
532 532 if (op == NULL)
533 533 return -ENOMEM;
534 534  
535   - get_dev_info(file->f_dentry->d_inode, &devi);
  535 + get_dev_info(file->f_path.dentry->d_inode, &devi);
536 536  
537 537 /*
538 538 * We need to make sure we can send a request. We use
... ... @@ -612,7 +612,7 @@
612 612 if (op == NULL)
613 613 return -ENOMEM;
614 614  
615   - get_dev_info(file->f_dentry->d_inode, &devi);
  615 + get_dev_info(file->f_path.dentry->d_inode, &devi);
616 616  
617 617 down(&reqSem);
618 618  
... ... @@ -777,7 +777,7 @@
777 777 if (op == NULL)
778 778 return -ENOMEM;
779 779  
780   - get_dev_info(file->f_dentry->d_inode, &devi);
  780 + get_dev_info(file->f_path.dentry->d_inode, &devi);
781 781  
782 782 /* Note: We currently only support one mode! */
783 783 if ((devi.devno >= viotape_numdev) || (devi.mode)) {
... ... @@ -822,7 +822,7 @@
822 822 return -ENOMEM;
823 823 init_completion(&op->com);
824 824  
825   - get_dev_info(file->f_dentry->d_inode, &devi);
  825 + get_dev_info(file->f_path.dentry->d_inode, &devi);
826 826  
827 827 if (devi.devno >= viotape_numdev) {
828 828 ret = -ENODEV;
drivers/char/vr41xx_giu.c
Diff comments   View file @ a7113a9
... ... @@ -506,7 +506,7 @@
506 506 unsigned int pin;
507 507 char value = '0';
508 508  
509   - pin = iminor(file->f_dentry->d_inode);
  509 + pin = iminor(file->f_path.dentry->d_inode);
510 510 if (pin >= giu_nr_pins)
511 511 return -EBADF;
512 512  
... ... @@ -530,7 +530,7 @@
530 530 char c;
531 531 int retval = 0;
532 532  
533   - pin = iminor(file->f_dentry->d_inode);
  533 + pin = iminor(file->f_path.dentry->d_inode);
534 534 if (pin >= giu_nr_pins)
535 535 return -EBADF;
536 536