Skip to content

Commit

Permalink
Convert from class_device to device in drivers/char
Browse files Browse the repository at this point in the history 
Convert from class_device to device in drivers/char.

Signed-off-by: Tony Jones <[email protected]>
Signed-off-by: Kay Sievers <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
@tonyj-suse @gregkh
tonyj-suse authored and gregkh committed Oct 12, 2007
1 parent 6004342 commit 07c015e
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 39 deletions.
4 changes: 2 additions & 2 deletions drivers/char/dsp56k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ static int __init dsp56k_init_driver(void)
err = PTR_ERR(dsp56k_class);
goto out_chrdev;
}
class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), "dsp56k");

printk(banner);
goto out;
Expand All @@ -527,7 +527,7 @@ module_init(dsp56k_init_driver);

static void __exit dsp56k_cleanup_driver(void)
{
class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
class_destroy(dsp56k_class);
unregister_chrdev(DSP56K_MAJOR, "dsp56k");
}
Expand Down
12 changes: 6 additions & 6 deletions drivers/char/ip2/ip2main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,8 @@ cleanup_module(void)
iiResetDelay( i2BoardPtrTable[i] );
/* free io addresses and Tibet */
release_region( ip2config.addr[i], 8 );
class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i));
class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i));
device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
}
/* Disable and remove interrupt handler. */
if ( (ip2config.irq[i] > 0) && have_requested_irq(ip2config.irq[i]) ) {
Expand Down Expand Up @@ -718,12 +718,12 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
}

if ( NULL != ( pB = i2BoardPtrTable[i] ) ) {
class_device_create(ip2_class, NULL,
device_create(ip2_class, NULL,
MKDEV(IP2_IPL_MAJOR, 4 * i),
NULL, "ipl%d", i);
class_device_create(ip2_class, NULL,
"ipl%d", i);
device_create(ip2_class, NULL,
MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
NULL, "stat%d", i);
"stat%d", i);

for ( box = 0; box < ABS_MAX_BOXES; ++box )
{
Expand Down
6 changes: 3 additions & 3 deletions drivers/char/ipmi/ipmi_devintf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ static void ipmi_new_smi(int if_num, struct device *device)
entry->dev = dev;

mutex_lock(&reg_list_mutex);
class_device_create(ipmi_class, NULL, dev, device, "ipmi%d", if_num);
device_create(ipmi_class, device, dev, "ipmi%d", if_num);
list_add(&entry->link, &reg_list);
mutex_unlock(&reg_list_mutex);
}
Expand All @@ -883,7 +883,7 @@ static void ipmi_smi_gone(int if_num)
break;
}
}
class_device_destroy(ipmi_class, dev);
device_destroy(ipmi_class, dev);
mutex_unlock(&reg_list_mutex);
}

Expand Down Expand Up @@ -938,7 +938,7 @@ static __exit void cleanup_ipmi(void)
mutex_lock(&reg_list_mutex);
list_for_each_entry_safe(entry, entry2, &reg_list, link) {
list_del(&entry->link);
class_device_destroy(ipmi_class, entry->dev);
device_destroy(ipmi_class, entry->dev);
kfree(entry);
}
mutex_unlock(&reg_list_mutex);
Expand Down
8 changes: 3 additions & 5 deletions drivers/char/istallion.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4624,9 +4624,8 @@ static int __init istallion_module_init(void)

istallion_class = class_create(THIS_MODULE, "staliomem");
for (i = 0; i < 4; i++)
class_device_create(istallion_class, NULL,
MKDEV(STL_SIOMEMMAJOR, i),
NULL, "staliomem%d", i);
device_create(istallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
"staliomem%d", i);

return 0;
err_deinit:
Expand Down Expand Up @@ -4659,8 +4658,7 @@ static void __exit istallion_module_exit(void)
unregister_chrdev(STL_SIOMEMMAJOR, "staliomem");

for (j = 0; j < 4; j++)
class_device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR,
j));
device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR, j));
class_destroy(istallion_class);

pci_unregister_driver(&stli_pcidriver);
Expand Down
5 changes: 2 additions & 3 deletions drivers/char/lp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,8 +799,7 @@ static int lp_register(int nr, struct parport *port)
if (reset)
lp_reset(nr);

class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), port->dev,
"lp%d", nr);
device_create(lp_class, port->dev, MKDEV(LP_MAJOR, nr), "lp%d", nr);

printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name,
(port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");
Expand Down Expand Up @@ -971,7 +970,7 @@ static void lp_cleanup_module (void)
if (lp_table[offset].dev == NULL)
continue;
parport_unregister_device(lp_table[offset].dev);
class_device_destroy(lp_class, MKDEV(LP_MAJOR, offset));
device_destroy(lp_class, MKDEV(LP_MAJOR, offset));
}
class_destroy(lp_class);
}
Expand Down
5 changes: 2 additions & 3 deletions drivers/char/pcmcia/cm4000_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1863,8 +1863,7 @@ static int cm4000_probe(struct pcmcia_device *link)
return ret;
}

class_device_create(cmm_class, NULL, MKDEV(major, i), NULL,
"cmm%d", i);
device_create(cmm_class, NULL, MKDEV(major, i), "cmm%d", i);

return 0;
}
Expand All @@ -1888,7 +1887,7 @@ static void cm4000_detach(struct pcmcia_device *link)
dev_table[devno] = NULL;
kfree(dev);

class_device_destroy(cmm_class, MKDEV(major, devno));
device_destroy(cmm_class, MKDEV(major, devno));

return;
}
Expand Down
5 changes: 2 additions & 3 deletions drivers/char/pcmcia/cm4040_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,7 @@ static int reader_probe(struct pcmcia_device *link)
return ret;
}

class_device_create(cmx_class, NULL, MKDEV(major, i), NULL,
"cmx%d", i);
device_create(cmx_class, NULL, MKDEV(major, i), "cmx%d", i);

return 0;
}
Expand All @@ -666,7 +665,7 @@ static void reader_detach(struct pcmcia_device *link)
dev_table[devno] = NULL;
kfree(dev);

class_device_destroy(cmx_class, MKDEV(major, devno));
device_destroy(cmx_class, MKDEV(major, devno));

return;
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/char/snsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,7 @@ scdrv_init(void)
continue;
}

class_device_create(snsc_class, NULL, dev, NULL,
"%s", devname);
device_create(snsc_class, NULL, dev, "%s", devname);

ia64_sn_irtr_intr_enable(scd->scd_nasid,
0 /*ignored */ ,
Expand Down
7 changes: 3 additions & 4 deletions drivers/char/stallion.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4778,9 +4778,8 @@ static int __init stallion_module_init(void)
if (IS_ERR(stallion_class))
printk("STALLION: failed to create class\n");
for (i = 0; i < 4; i++)
class_device_create(stallion_class, NULL,
MKDEV(STL_SIOMEMMAJOR, i), NULL,
"staliomem%d", i);
device_create(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
"staliomem%d", i);

return 0;
err_unrtty:
Expand Down Expand Up @@ -4816,7 +4815,7 @@ static void __exit stallion_module_exit(void)
}

for (i = 0; i < 4; i++)
class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
unregister_chrdev(STL_SIOMEMMAJOR, "staliomem");
class_destroy(stallion_class);

Expand Down
6 changes: 3 additions & 3 deletions drivers/char/tipar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ tipar_register(int nr, struct parport *port)
goto out;
}

class_device_create(tipar_class, NULL, MKDEV(TIPAR_MAJOR,
TIPAR_MINOR + nr), port->dev, "par%d", nr);
device_create(tipar_class, port->dev, MKDEV(TIPAR_MAJOR,
TIPAR_MINOR + nr), "par%d", nr);

/* Display informations */
pr_info("tipar%d: using %s (%s)\n", nr, port->name, (port->irq ==
Expand Down Expand Up @@ -534,7 +534,7 @@ tipar_cleanup_module(void)
if (table[i].dev == NULL)
continue;
parport_unregister_device(table[i].dev);
class_device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, i));
device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, i));
}
class_destroy(tipar_class);

Expand Down
10 changes: 5 additions & 5 deletions drivers/char/viotape.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,10 +871,10 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
state[i].cur_part = 0;
for (j = 0; j < MAX_PARTITIONS; ++j)
state[i].part_stat_rwi[j] = VIOT_IDLE;
class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i), NULL,
device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i),
"iseries!vt%d", i);
class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
NULL, "iseries!nvt%d", i);
device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
"iseries!nvt%d", i);
printk(VIOTAPE_KERN_INFO "tape iseries/vt%d is iSeries "
"resource %10.10s type %4.4s, model %3.3s\n",
i, viotape_unitinfo[i].rsrcname,
Expand All @@ -886,8 +886,8 @@ static int viotape_remove(struct vio_dev *vdev)
{
int i = vdev->unit_address;

class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80));
class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i));
device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80));
device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i));
return 0;
}

Expand Down

0 comments on commit 07c015e

Please sign in to comment.