[PATCH] remove explicit k_name use in atmel_cs.c, bt3c_cs.c

drivers/bluetooth/bt3c_cs.c

@@ -490,13 +490,10 @@ static int bt3c_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long
 
 static struct device *bt3c_device(void)
 {
-	static char *kobj_name = "bt3c";
-
 	static struct device dev = {
 		.bus_id = "pcmcia",
 	};
-	dev.kobj.k_name = kmalloc(strlen(kobj_name) + 1, GFP_KERNEL);
-	strcpy(dev.kobj.k_name, kobj_name);
+	kobject_set_name(&dev.kobj, "bt3c");
 	kobject_init(&dev.kobj);
 
 	return &dev;

drivers/net/wireless/atmel_cs.c

@@ -350,13 +350,10 @@ static struct {
 /* This is strictly temporary, until PCMCIA devices get integrated into the device model. */
 static struct device *atmel_device(void)
 {
-	static char *kobj_name = "atmel_cs";
-
 	static struct device dev = {
 		.bus_id    = "pcmcia",
 	};
-	dev.kobj.k_name = kmalloc(strlen(kobj_name)+1, GFP_KERNEL);
-	strcpy(dev.kobj.k_name, kobj_name);
+	kobject_set_name(&dev.kobj, "atmel_cs");
 	kobject_init(&dev.kobj);
 	
 	return &dev;