Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b98cb4b7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

driver core: remove DEVICE_ID_SIZE define 



There is no such thing as a "device id size" in the driver core, so
remove the define and fix up any users of this odd define in the rest of
the kernel.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ca52a498

drivers/memstick/host/jmb38x_ms.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct jmb38x_ms_host { 
	void __iomem            *addr;

	spinlock_t              lock;

	int                     id;

	char                    host_id[DEVICE_ID_SIZE];

	char                    host_id[32];

	int                     irq;

	unsigned int            block_pos;

	unsigned long           timeout_jiffies;
@@ -781,7 +781,7 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt) 


	spin_lock_init(&host->lock);

	host->id = cnt;

	snprintf(host->host_id, DEVICE_ID_SIZE, DRIVER_NAME ":slot%d",

	snprintf(host->host_id, sizeof(host->host_id), DRIVER_NAME ":slot%d",

		 host->id);

	host->irq = jm->pdev->irq;

	host->timeout_jiffies = msecs_to_jiffies(1000);

include/linux/device.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <asm/atomic.h>

#include <asm/device.h>



#define DEVICE_ID_SIZE		32

#define BUS_ID_SIZE		20



struct device;