Commit aab0de24 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman

driver core: remove KOBJ_NAME_LEN define

Kobjects do not have a limit in name size since a while, so stop
pretending that they do.
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f75b1c60
...@@ -334,7 +334,7 @@ static int omap_mbox_init(struct omap_mbox *mbox) ...@@ -334,7 +334,7 @@ static int omap_mbox_init(struct omap_mbox *mbox)
} }
mbox->dev.class = &omap_mbox_class; mbox->dev.class = &omap_mbox_class;
strlcpy(mbox->dev.bus_id, mbox->name, KOBJ_NAME_LEN); strlcpy(mbox->dev.bus_id, mbox->name, BUS_ID_SIZE);
dev_set_drvdata(&mbox->dev, mbox); dev_set_drvdata(&mbox->dev, mbox);
ret = device_register(&mbox->dev); ret = device_register(&mbox->dev);
......
...@@ -224,7 +224,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp, ...@@ -224,7 +224,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
if (!strcmp(type, "domain-services-port")) if (!strcmp(type, "domain-services-port"))
bus_id_name = "ds"; bus_id_name = "ds";
if (strlen(bus_id_name) >= KOBJ_NAME_LEN - 4) { if (strlen(bus_id_name) >= BUS_ID_SIZE - 4) {
printk(KERN_ERR "VIO: bus_id_name [%s] is too long.\n", printk(KERN_ERR "VIO: bus_id_name [%s] is too long.\n",
bus_id_name); bus_id_name);
return NULL; return NULL;
......
...@@ -1670,7 +1670,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1670,7 +1670,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
INIT_DELAYED_WORK(&ioc->fault_reset_work, mpt_fault_reset_work); INIT_DELAYED_WORK(&ioc->fault_reset_work, mpt_fault_reset_work);
spin_lock_init(&ioc->fault_reset_work_lock); spin_lock_init(&ioc->fault_reset_work_lock);
snprintf(ioc->reset_work_q_name, KOBJ_NAME_LEN, "mpt_poll_%d", ioc->id); snprintf(ioc->reset_work_q_name, sizeof(ioc->reset_work_q_name),
"mpt_poll_%d", ioc->id);
ioc->reset_work_q = ioc->reset_work_q =
create_singlethread_workqueue(ioc->reset_work_q_name); create_singlethread_workqueue(ioc->reset_work_q_name);
if (!ioc->reset_work_q) { if (!ioc->reset_work_q) {
......
...@@ -707,12 +707,12 @@ typedef struct _MPT_ADAPTER ...@@ -707,12 +707,12 @@ typedef struct _MPT_ADAPTER
u8 fc_link_speed[2]; u8 fc_link_speed[2];
spinlock_t fc_rescan_work_lock; spinlock_t fc_rescan_work_lock;
struct work_struct fc_rescan_work; struct work_struct fc_rescan_work;
char fc_rescan_work_q_name[KOBJ_NAME_LEN]; char fc_rescan_work_q_name[20];
struct workqueue_struct *fc_rescan_work_q; struct workqueue_struct *fc_rescan_work_q;
struct scsi_cmnd **ScsiLookup; struct scsi_cmnd **ScsiLookup;
spinlock_t scsi_lookup_lock; spinlock_t scsi_lookup_lock;
char reset_work_q_name[KOBJ_NAME_LEN]; char reset_work_q_name[20];
struct workqueue_struct *reset_work_q; struct workqueue_struct *reset_work_q;
struct delayed_work fault_reset_work; struct delayed_work fault_reset_work;
spinlock_t fault_reset_work_lock; spinlock_t fault_reset_work_lock;
......
...@@ -1326,8 +1326,8 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1326,8 +1326,8 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* initialize workqueue */ /* initialize workqueue */
snprintf(ioc->fc_rescan_work_q_name, KOBJ_NAME_LEN, "mptfc_wq_%d", snprintf(ioc->fc_rescan_work_q_name, sizeof(ioc->fc_rescan_work_q_name),
sh->host_no); "mptfc_wq_%d", sh->host_no);
ioc->fc_rescan_work_q = ioc->fc_rescan_work_q =
create_singlethread_workqueue(ioc->fc_rescan_work_q_name); create_singlethread_workqueue(ioc->fc_rescan_work_q_name);
if (!ioc->fc_rescan_work_q) if (!ioc->fc_rescan_work_q)
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define _ACPIPHP_H #define _ACPIPHP_H
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/kobject.h> /* for KOBJ_NAME_LEN */ #include <linux/kobject.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/pci_hotplug.h> #include <linux/pci_hotplug.h>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
/* name size which is used for entries in pcihpfs */ /* name size which is used for entries in pcihpfs */
#define SLOT_NAME_SIZE KOBJ_NAME_LEN /* {_SUN} */ #define SLOT_NAME_SIZE 20 /* {_SUN} */
struct acpiphp_bridge; struct acpiphp_bridge;
struct acpiphp_slot; struct acpiphp_slot;
......
...@@ -232,8 +232,8 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev) ...@@ -232,8 +232,8 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev)
} }
if (shost->transportt->create_work_queue) { if (shost->transportt->create_work_queue) {
snprintf(shost->work_q_name, KOBJ_NAME_LEN, "scsi_wq_%d", snprintf(shost->work_q_name, sizeof(shost->work_q_name),
shost->host_no); "scsi_wq_%d", shost->host_no);
shost->work_q = create_singlethread_workqueue( shost->work_q = create_singlethread_workqueue(
shost->work_q_name); shost->work_q_name);
if (!shost->work_q) { if (!shost->work_q) {
......
...@@ -417,15 +417,16 @@ static int fc_host_setup(struct transport_container *tc, struct device *dev, ...@@ -417,15 +417,16 @@ static int fc_host_setup(struct transport_container *tc, struct device *dev,
fc_host->next_vport_number = 0; fc_host->next_vport_number = 0;
fc_host->npiv_vports_inuse = 0; fc_host->npiv_vports_inuse = 0;
snprintf(fc_host->work_q_name, KOBJ_NAME_LEN, "fc_wq_%d", snprintf(fc_host->work_q_name, sizeof(fc_host->work_q_name),
shost->host_no); "fc_wq_%d", shost->host_no);
fc_host->work_q = create_singlethread_workqueue( fc_host->work_q = create_singlethread_workqueue(
fc_host->work_q_name); fc_host->work_q_name);
if (!fc_host->work_q) if (!fc_host->work_q)
return -ENOMEM; return -ENOMEM;
snprintf(fc_host->devloss_work_q_name, KOBJ_NAME_LEN, "fc_dl_%d", snprintf(fc_host->devloss_work_q_name,
shost->host_no); sizeof(fc_host->devloss_work_q_name),
"fc_dl_%d", shost->host_no);
fc_host->devloss_work_q = create_singlethread_workqueue( fc_host->devloss_work_q = create_singlethread_workqueue(
fc_host->devloss_work_q_name); fc_host->devloss_work_q_name);
if (!fc_host->devloss_work_q) { if (!fc_host->devloss_work_q) {
......
...@@ -247,8 +247,8 @@ static int iscsi_setup_host(struct transport_container *tc, struct device *dev, ...@@ -247,8 +247,8 @@ static int iscsi_setup_host(struct transport_container *tc, struct device *dev,
atomic_set(&ihost->nr_scans, 0); atomic_set(&ihost->nr_scans, 0);
mutex_init(&ihost->mutex); mutex_init(&ihost->mutex);
snprintf(ihost->scan_workq_name, KOBJ_NAME_LEN, "iscsi_scan_%d", snprintf(ihost->scan_workq_name, sizeof(ihost->scan_workq_name),
shost->host_no); "iscsi_scan_%d", shost->host_no);
ihost->scan_workq = create_singlethread_workqueue( ihost->scan_workq = create_singlethread_workqueue(
ihost->scan_workq_name); ihost->scan_workq_name);
if (!ihost->scan_workq) if (!ihost->scan_workq)
......
...@@ -401,7 +401,7 @@ void register_disk(struct gendisk *disk) ...@@ -401,7 +401,7 @@ void register_disk(struct gendisk *disk)
disk->dev.parent = disk->driverfs_dev; disk->dev.parent = disk->driverfs_dev;
disk->dev.devt = MKDEV(disk->major, disk->first_minor); disk->dev.devt = MKDEV(disk->major, disk->first_minor);
strlcpy(disk->dev.bus_id, disk->disk_name, KOBJ_NAME_LEN); strlcpy(disk->dev.bus_id, disk->disk_name, BUS_ID_SIZE);
/* ewww... some of these buggers have / in the name... */ /* ewww... some of these buggers have / in the name... */
s = strchr(disk->dev.bus_id, '/'); s = strchr(disk->dev.bus_id, '/');
if (s) if (s)
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
/* DEVICE_NAME_HALF is really less than half to accommodate slop */ /* DEVICE_NAME_HALF is really less than half to accommodate slop */
#define DEVICE_NAME_HALF __stringify(20) #define DEVICE_NAME_HALF __stringify(20)
#define DEVICE_ID_SIZE 32 #define DEVICE_ID_SIZE 32
#define BUS_ID_SIZE KOBJ_NAME_LEN #define BUS_ID_SIZE 20
struct device; struct device;
struct device_driver; struct device_driver;
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#define KOBJ_NAME_LEN 20
#define UEVENT_HELPER_PATH_LEN 256 #define UEVENT_HELPER_PATH_LEN 256
#define UEVENT_NUM_ENVP 32 /* number of env pointers */ #define UEVENT_NUM_ENVP 32 /* number of env pointers */
#define UEVENT_BUFFER_SIZE 2048 /* buffer for the variables */ #define UEVENT_BUFFER_SIZE 2048 /* buffer for the variables */
......
...@@ -733,7 +733,7 @@ struct spi_board_info { ...@@ -733,7 +733,7 @@ struct spi_board_info {
* controller_data goes to spi_device.controller_data, * controller_data goes to spi_device.controller_data,
* irq is copied too * irq is copied too
*/ */
char modalias[KOBJ_NAME_LEN]; char modalias[32];
const void *platform_data; const void *platform_data;
void *controller_data; void *controller_data;
int irq; int irq;
......
...@@ -623,7 +623,7 @@ struct Scsi_Host { ...@@ -623,7 +623,7 @@ struct Scsi_Host {
/* /*
* Optional work queue to be utilized by the transport * Optional work queue to be utilized by the transport
*/ */
char work_q_name[KOBJ_NAME_LEN]; char work_q_name[20];
struct workqueue_struct *work_q; struct workqueue_struct *work_q;
/* /*
......
...@@ -489,9 +489,9 @@ struct fc_host_attrs { ...@@ -489,9 +489,9 @@ struct fc_host_attrs {
u16 npiv_vports_inuse; u16 npiv_vports_inuse;
/* work queues for rport state manipulation */ /* work queues for rport state manipulation */
char work_q_name[KOBJ_NAME_LEN]; char work_q_name[20];
struct workqueue_struct *work_q; struct workqueue_struct *work_q;
char devloss_work_q_name[KOBJ_NAME_LEN]; char devloss_work_q_name[20];
struct workqueue_struct *devloss_work_q; struct workqueue_struct *devloss_work_q;
}; };
......
...@@ -198,7 +198,7 @@ struct iscsi_cls_host { ...@@ -198,7 +198,7 @@ struct iscsi_cls_host {
atomic_t nr_scans; atomic_t nr_scans;
struct mutex mutex; struct mutex mutex;
struct workqueue_struct *scan_workq; struct workqueue_struct *scan_workq;
char scan_workq_name[KOBJ_NAME_LEN]; char scan_workq_name[20];
}; };
extern void iscsi_host_for_each_session(struct Scsi_Host *shost, extern void iscsi_host_for_each_session(struct Scsi_Host *shost,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment