Commit ecf0ed9

authored

Merge pull request #349 from visitorckw/fix-owner-setting

Fix incorrect conditional usage of .owner

2 parents 5aabe58 + f798488 commit ecf0ed9Copy full SHA for ecf0ed9

File tree

-11

lines changed

-11

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,12 +148,10 @@ static ssize_t device_read(struct file filp, char __user buffer,`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`static struct file_operations fops = {`
`151`		`-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)`
`152`	`151`	`.owner = THIS_MODULE,`
`153`		`-#endif`
`154`	`152`	`.open = device_open,`
`155`	`153`	`.release = device_release,`
`156`		`- .read = device_read`
	`154`	`+ .read = device_read,`
`157`	`155`	`};`
`158`	`156`
`159`	`157`	`/* Initialize the module - Register the character device */`
`@@ -182,9 +180,7 @@ static int __init dht11_init(void)`
`182`	`180`	`MINOR(dht11_device.dev_num));`
`183`	`181`
`184`	`182`	`/* Prevents module unloading while operations are in use */`
`185`		`-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)`
`186`	`183`	`dht11_device.cdev.owner = THIS_MODULE;`
`187`		`-#endif`
`188`	`184`
`189`	`185`	`cdev_init(&dht11_device.cdev, &fops);`
`190`	`186`	`ret = cdev_add(&dht11_device.cdev, dht11_device.dev_num, 1);`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,7 @@ static int test_ioctl_open(struct inode inode, struct file filp)`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`static struct file_operations fops = {`
`143`		`-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)`
`144`	`143`	`.owner = THIS_MODULE,`
`145`		`-#endif`
`146`	`144`	`.open = test_ioctl_open,`
`147`	`145`	`.release = test_ioctl_close,`
`148`	`146`	`.read = test_ioctl_read,`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,7 @@ static struct class *cls;`
`41`	`41`	`static DEFINE_STATIC_KEY_FALSE(fkey);`
`42`	`42`
`43`	`43`	`static struct file_operations chardev_fops = {`
`44`		`-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)`
`45`	`44`	`.owner = THIS_MODULE,`
`46`		`-#endif`
`47`	`45`	`.open = device_open,`
`48`	`46`	`.release = device_release,`
`49`	`47`	`.read = device_read,`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,7 @@ static ssize_t vinput_write(struct file file, const char __user buffer,`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`static const struct file_operations vinput_fops = {`
`136`		`-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)`
`137`	`136`	`.owner = THIS_MODULE,`
`138`		`-#endif`
`139`	`137`	`.open = vinput_open,`
`140`	`138`	`.release = vinput_release,`
`141`	`139`	`.read = vinput_read,`
`@@ -337,6 +335,9 @@ ATTRIBUTE_GROUPS(vinput_class);`
`337`	`335`
`338`	`336`	`static struct class vinput_class = {`
`339`	`337`	`.name = "vinput",`
	`338`	`+/* .owner was removed in Linux v6.4 via upstream commit 6e30a66433af ("driver core: class: remove`
	`339`	`+ * struct module owner out of struct class")`
	`340`	`+ */`
`340`	`341`	`#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)`
`341`	`342`	`.owner = THIS_MODULE,`
`342`	`343`	`#endif`

Comments

(0)