Skip to content

Commit

Permalink
driver core: class: remove module * from class_create()
Browse files Browse the repository at this point in the history
The module pointer in class_create() never actually did anything, and it
shouldn't have been requred to be set as a parameter even if it did
something.  So just remove it and fix up all callers of the function in
the kernel tree at the same time.

Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Link: https://lore.kernel.org/r/20230313181843.1207845-4-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
gregkh committed Mar 17, 2023
1 parent 6e30a66 commit 1aaba11
Show file tree
Hide file tree
Showing 140 changed files with 144 additions and 145 deletions.
2 changes: 1 addition & 1 deletion arch/mips/kernel/mips-mt.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ static int __init mips_mt_init(void)
{
struct class *mtc;

mtc = class_create(THIS_MODULE, "mt");
mtc = class_create("mt");
if (IS_ERR(mtc))
return PTR_ERR(mtc);

Expand Down
2 changes: 1 addition & 1 deletion arch/mips/sibyte/common/sb_tbprof.c
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ static int __init sbprof_tb_init(void)
return -EIO;
}

tbc = class_create(THIS_MODULE, "sb_tracebuffer");
tbc = class_create("sb_tracebuffer");
if (IS_ERR(tbc)) {
err = PTR_ERR(tbc);
goto out_chrdev;
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/book3s/vas-api.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ int vas_register_coproc_api(struct module *mod, enum vas_cop_type cop_type,
pr_devel("%s device allocated, dev [%i,%i]\n", name,
MAJOR(coproc_device.devt), MINOR(coproc_device.devt));

coproc_device.class = class_create(mod, name);
coproc_device.class = class_create(name);
if (IS_ERR(coproc_device.class)) {
rc = PTR_ERR(coproc_device.class);
pr_err("Unable to create %s class %d\n", name, rc);
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/resctrl/pseudo_lock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@ int rdt_pseudo_lock_init(void)

pseudo_lock_major = ret;

pseudo_lock_class = class_create(THIS_MODULE, "pseudo_lock");
pseudo_lock_class = class_create("pseudo_lock");
if (IS_ERR(pseudo_lock_class)) {
ret = PTR_ERR(pseudo_lock_class);
unregister_chrdev(pseudo_lock_major, "pseudo_lock");
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpuid.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static int __init cpuid_init(void)
CPUID_MAJOR);
return -EBUSY;
}
cpuid_class = class_create(THIS_MODULE, "cpuid");
cpuid_class = class_create("cpuid");
if (IS_ERR(cpuid_class)) {
err = PTR_ERR(cpuid_class);
goto out_chrdev;
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/msr.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static int __init msr_init(void)
pr_err("unable to get major %d for msr\n", MSR_MAJOR);
return -EBUSY;
}
msr_class = class_create(THIS_MODULE, "msr");
msr_class = class_create("msr");
if (IS_ERR(msr_class)) {
err = PTR_ERR(msr_class);
goto out_chrdev;
Expand Down
2 changes: 1 addition & 1 deletion block/bsg.c
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ static int __init bsg_init(void)
dev_t devid;
int ret;

bsg_class = class_create(THIS_MODULE, "bsg");
bsg_class = class_create("bsg");
if (IS_ERR(bsg_class))
return PTR_ERR(bsg_class);
bsg_class->devnode = bsg_devnode;
Expand Down
2 changes: 1 addition & 1 deletion drivers/accel/drm_accel.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static char *accel_devnode(const struct device *dev, umode_t *mode)

static int accel_sysfs_init(void)
{
accel_class = class_create(THIS_MODULE, "accel");
accel_class = class_create("accel");
if (IS_ERR(accel_class))
return PTR_ERR(accel_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/accel/habanalabs/common/habanalabs_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ static int __init hl_init(void)

hl_major = MAJOR(dev);

hl_class = class_create(THIS_MODULE, HL_NAME);
hl_class = class_create(HL_NAME);
if (IS_ERR(hl_class)) {
pr_err("failed to allocate class\n");
rc = PTR_ERR(hl_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/base/power/wakeup_stats.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void wakeup_source_sysfs_remove(struct wakeup_source *ws)

static int __init wakeup_sources_sysfs_init(void)
{
wakeup_class = class_create(THIS_MODULE, "wakeup");
wakeup_class = class_create("wakeup");

return PTR_ERR_OR_ZERO(wakeup_class);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/aoe/aoechr.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ aoechr_init(void)
}
init_completion(&emsgs_comp);
spin_lock_init(&emsgs_lock);
aoe_class = class_create(THIS_MODULE, "aoe");
aoe_class = class_create("aoe");
if (IS_ERR(aoe_class)) {
unregister_chrdev(AOE_MAJOR, "aoechr");
return PTR_ERR(aoe_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/rnbd/rnbd-clt-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ int rnbd_clt_create_sysfs_files(void)
{
int err;

rnbd_dev_class = class_create(THIS_MODULE, "rnbd-client");
rnbd_dev_class = class_create("rnbd-client");
if (IS_ERR(rnbd_dev_class))
return PTR_ERR(rnbd_dev_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/block/rnbd/rnbd-srv-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ int rnbd_srv_create_sysfs_files(void)
{
int err;

rnbd_dev_class = class_create(THIS_MODULE, "rnbd-server");
rnbd_dev_class = class_create("rnbd-server");
if (IS_ERR(rnbd_dev_class))
return PTR_ERR(rnbd_dev_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/block/ublk_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -2266,7 +2266,7 @@ static int __init ublk_init(void)
if (ret)
goto unregister_mis;

ublk_chr_class = class_create(THIS_MODULE, "ublk-char");
ublk_chr_class = class_create("ublk-char");
if (IS_ERR(ublk_chr_class)) {
ret = PTR_ERR(ublk_chr_class);
goto free_chrdev_region;
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/bsr.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int __init bsr_init(void)
if (!np)
goto out_err;

bsr_class = class_create(THIS_MODULE, "bsr");
bsr_class = class_create("bsr");
if (IS_ERR(bsr_class)) {
printk(KERN_ERR "class_create() failed for bsr_class\n");
ret = PTR_ERR(bsr_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/dsp56k.c
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ static int __init dsp56k_init_driver(void)
printk("DSP56k driver: Unable to register driver\n");
return -ENODEV;
}
dsp56k_class = class_create(THIS_MODULE, "dsp56k");
dsp56k_class = class_create("dsp56k");
if (IS_ERR(dsp56k_class)) {
err = PTR_ERR(dsp56k_class);
goto out_chrdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/ipmi/ipmi_devintf.c
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ static int __init init_ipmi_devintf(void)

pr_info("ipmi device interface\n");

ipmi_class = class_create(THIS_MODULE, "ipmi");
ipmi_class = class_create("ipmi");
if (IS_ERR(ipmi_class)) {
pr_err("ipmi: can't register device class\n");
return PTR_ERR(ipmi_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/lp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ static int __init lp_init(void)
return -EIO;
}

lp_class = class_create(THIS_MODULE, "printer");
lp_class = class_create("printer");
if (IS_ERR(lp_class)) {
err = PTR_ERR(lp_class);
goto out_reg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ static int __init chr_dev_init(void)
if (register_chrdev(MEM_MAJOR, "mem", &memory_fops))
printk("unable to get major %d for memory devs\n", MEM_MAJOR);

mem_class = class_create(THIS_MODULE, "mem");
mem_class = class_create("mem");
if (IS_ERR(mem_class))
return PTR_ERR(mem_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/char/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ static int __init misc_init(void)
struct proc_dir_entry *ret;

ret = proc_create_seq("misc", 0, NULL, &misc_seq_ops);
misc_class = class_create(THIS_MODULE, "misc");
misc_class = class_create("misc");
err = PTR_ERR(misc_class);
if (IS_ERR(misc_class))
goto fail_remove;
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/pcmcia/cm4000_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ static int __init cmm_init(void)
{
int rc;

cmm_class = class_create(THIS_MODULE, "cardman_4000");
cmm_class = class_create("cardman_4000");
if (IS_ERR(cmm_class))
return PTR_ERR(cmm_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/char/pcmcia/cm4040_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ static int __init cm4040_init(void)
{
int rc;

cmx_class = class_create(THIS_MODULE, "cardman_4040");
cmx_class = class_create("cardman_4040");
if (IS_ERR(cmx_class))
return PTR_ERR(cmx_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/char/pcmcia/scr24x_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ static int __init scr24x_init(void)
{
int ret;

scr24x_class = class_create(THIS_MODULE, "scr24x");
scr24x_class = class_create("scr24x");
if (IS_ERR(scr24x_class))
return PTR_ERR(scr24x_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/char/ppdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ static int __init ppdev_init(void)
pr_warn(CHRDEV ": unable to get major %d\n", PP_MAJOR);
return -EIO;
}
ppdev_class = class_create(THIS_MODULE, CHRDEV);
ppdev_class = class_create(CHRDEV);
if (IS_ERR(ppdev_class)) {
err = PTR_ERR(ppdev_class);
goto out_chrdev;
Expand Down
4 changes: 2 additions & 2 deletions drivers/char/tpm/tpm-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,13 +466,13 @@ static int __init tpm_init(void)
{
int rc;

tpm_class = class_create(THIS_MODULE, "tpm");
tpm_class = class_create("tpm");
if (IS_ERR(tpm_class)) {
pr_err("couldn't create tpm class\n");
return PTR_ERR(tpm_class);
}

tpmrm_class = class_create(THIS_MODULE, "tpmrm");
tpmrm_class = class_create("tpmrm");
if (IS_ERR(tpmrm_class)) {
pr_err("couldn't create tpmrm class\n");
rc = PTR_ERR(tpmrm_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/virtio_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,7 @@ static int __init virtio_console_init(void)
{
int err;

pdrvdata.class = class_create(THIS_MODULE, "virtio-ports");
pdrvdata.class = class_create("virtio-ports");
if (IS_ERR(pdrvdata.class)) {
err = PTR_ERR(pdrvdata.class);
pr_err("Error %d creating virtio-ports class\n", err);
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/xilinx_hwicap/xilinx_hwicap.c
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ static int __init hwicap_module_init(void)
dev_t devt;
int retval;

icap_class = class_create(THIS_MODULE, "xilinx_config");
icap_class = class_create("xilinx_config");
mutex_init(&icap_sem);

devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR);
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/xillybus/xillybus_class.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ EXPORT_SYMBOL(xillybus_find_inode);

static int __init xillybus_class_init(void)
{
xillybus_class = class_create(THIS_MODULE, "xillybus");
xillybus_class = class_create("xillybus");

if (IS_ERR(xillybus_class)) {
pr_warn("Failed to register xillybus class\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -3383,7 +3383,7 @@ static int __init comedi_init(void)
if (retval)
goto out_unregister_chrdev_region;

comedi_class = class_create(THIS_MODULE, "comedi");
comedi_class = class_create("comedi");
if (IS_ERR(comedi_class)) {
retval = PTR_ERR(comedi_class);
pr_err("failed to create class\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/comedi/drivers/comedi_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ static int __init comedi_test_init(void)
}

if (!config_mode) {
ctcls = class_create(THIS_MODULE, CLASS_NAME);
ctcls = class_create(CLASS_NAME);
if (IS_ERR(ctcls)) {
pr_warn("comedi_test: unable to create class\n");
goto clean3;
Expand Down
2 changes: 1 addition & 1 deletion drivers/crypto/qat/qat_common/adf_ctl_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static int adf_chr_drv_create(void)
return -EFAULT;
}

adf_ctl_drv.drv_class = class_create(THIS_MODULE, DEVICE_NAME);
adf_ctl_drv.drv_class = class_create(DEVICE_NAME);
if (IS_ERR(adf_ctl_drv.drv_class)) {
pr_err("QAT: class_create failed for adf_ctl\n");
goto err_chrdev_unreg;
Expand Down
2 changes: 1 addition & 1 deletion drivers/dca/dca-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int __init dca_sysfs_init(void)
idr_init(&dca_idr);
spin_lock_init(&dca_idr_lock);

dca_class = class_create(THIS_MODULE, "dca");
dca_class = class_create("dca");
if (IS_ERR(dca_class)) {
idr_destroy(&dca_idr);
return PTR_ERR(dca_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/devfreq/devfreq-event.c
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ ATTRIBUTE_GROUPS(devfreq_event);

static int __init devfreq_event_init(void)
{
devfreq_event_class = class_create(THIS_MODULE, "devfreq-event");
devfreq_event_class = class_create("devfreq-event");
if (IS_ERR(devfreq_event_class)) {
pr_err("%s: couldn't create class\n", __FILE__);
return PTR_ERR(devfreq_event_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/devfreq/devfreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,7 @@ DEFINE_SHOW_ATTRIBUTE(devfreq_summary);

static int __init devfreq_init(void)
{
devfreq_class = class_create(THIS_MODULE, "devfreq");
devfreq_class = class_create("devfreq");
if (IS_ERR(devfreq_class)) {
pr_err("%s: couldn't create class\n", __FILE__);
return PTR_ERR(devfreq_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma-buf/dma-heap.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ static int dma_heap_init(void)
if (ret)
return ret;

dma_heap_class = class_create(THIS_MODULE, DEVNAME);
dma_heap_class = class_create(DEVNAME);
if (IS_ERR(dma_heap_class)) {
unregister_chrdev_region(dma_heap_devt, NUM_HEAP_MINORS);
return PTR_ERR(dma_heap_class);
Expand Down
2 changes: 1 addition & 1 deletion drivers/extcon/extcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ ATTRIBUTE_GROUPS(extcon);
static int create_extcon_class(void)
{
if (!extcon_class) {
extcon_class = class_create(THIS_MODULE, "extcon");
extcon_class = class_create("extcon");
if (IS_ERR(extcon_class))
return PTR_ERR(extcon_class);
extcon_class->dev_groups = extcon_groups;
Expand Down
2 changes: 1 addition & 1 deletion drivers/fpga/fpga-bridge.c
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ static void fpga_bridge_dev_release(struct device *dev)

static int __init fpga_bridge_dev_init(void)
{
fpga_bridge_class = class_create(THIS_MODULE, "fpga_bridge");
fpga_bridge_class = class_create("fpga_bridge");
if (IS_ERR(fpga_bridge_class))
return PTR_ERR(fpga_bridge_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/fpga/fpga-mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ static int __init fpga_mgr_class_init(void)
{
pr_info("FPGA manager framework\n");

fpga_mgr_class = class_create(THIS_MODULE, "fpga_manager");
fpga_mgr_class = class_create("fpga_manager");
if (IS_ERR(fpga_mgr_class))
return PTR_ERR(fpga_mgr_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/fpga/fpga-region.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static void fpga_region_dev_release(struct device *dev)
*/
static int __init fpga_region_init(void)
{
fpga_region_class = class_create(THIS_MODULE, "fpga_region");
fpga_region_class = class_create("fpga_region");
if (IS_ERR(fpga_region_class))
return PTR_ERR(fpga_region_class);

Expand Down
2 changes: 1 addition & 1 deletion drivers/gnss/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ static int __init gnss_module_init(void)
return ret;
}

gnss_class = class_create(THIS_MODULE, "gnss");
gnss_class = class_create("gnss");
if (IS_ERR(gnss_class)) {
ret = PTR_ERR(gnss_class);
pr_err("failed to create class: %d\n", ret);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ int kfd_chardev_init(void)
if (err < 0)
goto err_register_chrdev;

kfd_class = class_create(THIS_MODULE, kfd_dev_name);
kfd_class = class_create(kfd_dev_name);
err = PTR_ERR(kfd_class);
if (IS_ERR(kfd_class))
goto err_class_create;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/display/drm_dp_aux_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ int drm_dp_aux_dev_init(void)
{
int res;

drm_dp_aux_dev_class = class_create(THIS_MODULE, "drm_dp_aux_dev");
drm_dp_aux_dev_class = class_create("drm_dp_aux_dev");
if (IS_ERR(drm_dp_aux_dev_class)) {
return PTR_ERR(drm_dp_aux_dev_class);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ int drm_sysfs_init(void)
{
int err;

drm_class = class_create(THIS_MODULE, "drm");
drm_class = class_create("drm");
if (IS_ERR(drm_class))
return PTR_ERR(drm_class);

Expand Down
Loading

0 comments on commit 1aaba11

Please sign in to comment.