7 files changed, 17 insertions, 15 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 75e599b85b64..34402c47027e 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -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);
         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 =
                 create_singlethread_workqueue(ioc->reset_work_q_name);
         if (!ioc->reset_work_q) {
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 6adab648dbb9..dff048cfa101 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -707,12 +707,12 @@ typedef struct _MPT_ADAPTER
         u8                       fc_link_speed[2];
         spinlock_t               fc_rescan_work_lock;
         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 scsi_cmnd        **ScsiLookup;
         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 delayed_work      fault_reset_work;
         spinlock_t               fault_reset_work_lock;
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index fc31ca6829d8..b36cae9ec6db 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -1326,8 +1326,8 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* initialize workqueue */
 
-        snprintf(ioc->fc_rescan_work_q_name, KOBJ_NAME_LEN, "mptfc_wq_%d",
-                sh->host_no);
+        snprintf(ioc->fc_rescan_work_q_name, sizeof(ioc->fc_rescan_work_q_name),
+                 "mptfc_wq_%d", sh->host_no);
         ioc->fc_rescan_work_q =
                 create_singlethread_workqueue(ioc->fc_rescan_work_q_name);
         if (!ioc->fc_rescan_work_q)
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index eecf7cbf4139..5a58b075dd8d 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -36,7 +36,7 @@
 #define _ACPIPHP_H
 
 #include <linux/acpi.h>
-#include <linux/kobject.h>      /* for KOBJ_NAME_LEN */
+#include <linux/kobject.h>
 #include <linux/mutex.h>
 #include <linux/pci_hotplug.h>
 
@@ -51,7 +51,7 @@
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
 
 /* 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_slot;
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 78dad28b70d5..fed0b02ebc1d 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -232,8 +232,8 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev)
         }
 
         if (shost->transportt->create_work_queue) {
-                snprintf(shost->work_q_name, KOBJ_NAME_LEN, "scsi_wq_%d",
-                        shost->host_no);
+                snprintf(shost->work_q_name, sizeof(shost->work_q_name),
+                         "scsi_wq_%d", shost->host_no);
                 shost->work_q = create_singlethread_workqueue(
                                         shost->work_q_name);
                 if (!shost->work_q) {
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 5fd64e70029d..a272b9a2c869 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -417,15 +417,16 @@ static int fc_host_setup(struct transport_container *tc, struct device *dev,
         fc_host->next_vport_number = 0;
         fc_host->npiv_vports_inuse = 0;
 
-        snprintf(fc_host->work_q_name, KOBJ_NAME_LEN, "fc_wq_%d",
-                shost->host_no);
+        snprintf(fc_host->work_q_name, sizeof(fc_host->work_q_name),
+                 "fc_wq_%d", shost->host_no);
         fc_host->work_q = create_singlethread_workqueue(
                                         fc_host->work_q_name);
         if (!fc_host->work_q)
                 return -ENOMEM;
 
-        snprintf(fc_host->devloss_work_q_name, KOBJ_NAME_LEN, "fc_dl_%d",
-                shost->host_no);
+        snprintf(fc_host->devloss_work_q_name,
+                 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_name);
         if (!fc_host->devloss_work_q) {
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 06748f318cd5..043c3921164f 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -247,8 +247,8 @@ static int iscsi_setup_host(struct transport_container *tc, struct device *dev,
         atomic_set(&ihost->nr_scans, 0);
         mutex_init(&ihost->mutex);
 
-        snprintf(ihost->scan_workq_name, KOBJ_NAME_LEN, "iscsi_scan_%d",
-                shost->host_no);
+        snprintf(ihost->scan_workq_name, sizeof(ihost->scan_workq_name),
+                 "iscsi_scan_%d", shost->host_no);
         ihost->scan_workq = create_singlethread_workqueue(
                                                 ihost->scan_workq_name);
         if (!ihost->scan_workq)