diff options
| author | Samuel Iglesias Gonsalvez <siglesias@igalia.com> | 2012-05-18 11:10:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-18 17:36:01 -0700 |
| commit | 611b564d196f8f6b90e0d8808be44eb5e18db9a2 (patch) | |
| tree | aac1d959e4976180286f2083694ec33f325ad55a | |
| parent | ec440335b1e360ab82ef4ce169b682ab4b9dcd2a (diff) | |
| download | linux-stable-611b564d196f8f6b90e0d8808be44eb5e18db9a2.tar.gz linux-stable-611b564d196f8f6b90e0d8808be44eb5e18db9a2.tar.bz2 linux-stable-611b564d196f8f6b90e0d8808be44eb5e18db9a2.zip | |
Staging: ipack: remove board_name and bus_name fields from struct ipack_device
Removed board_name and bus_name fields from struct ipack_device that are
completely useless.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ipack/bridges/tpci200.c | 20 | ||||
| -rw-r--r-- | drivers/staging/ipack/bridges/tpci200.h | 8 | ||||
| -rw-r--r-- | drivers/staging/ipack/ipack.h | 4 |
3 files changed, 8 insertions, 24 deletions
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c index 392aec0666c6..b460587d4d79 100644 --- a/drivers/staging/ipack/bridges/tpci200.c +++ b/drivers/staging/ipack/bridges/tpci200.c @@ -371,9 +371,7 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) #ifdef CONFIG_SYSFS -static struct ipack_device *tpci200_slot_register(const char *board_name, - int size, - unsigned int tpci200_number, +static struct ipack_device *tpci200_slot_register(unsigned int tpci200_number, unsigned int slot_position) { int found = 0; @@ -437,7 +435,7 @@ static ssize_t tpci200_store_board(struct device *pdev, const char *buf, if (dev != NULL) return -EBUSY; - dev = tpci200_slot_register(buf, count, card->number, slot); + dev = tpci200_slot_register(card->number, slot); if (dev == NULL) return -ENODEV; @@ -450,7 +448,7 @@ static ssize_t tpci200_show_board(struct device *pdev, char *buf, int slot) struct ipack_device *dev = card->slots[slot].dev; if (dev != NULL) - return snprintf(buf, PAGE_SIZE, "%s\n", dev->board_name); + return snprintf(buf, PAGE_SIZE, "%s\n", dev_name(&dev->dev)); else return snprintf(buf, PAGE_SIZE, "none\n"); } @@ -975,17 +973,7 @@ static int tpci200_request_irq(struct ipack_device *dev, int vector, slot_irq->vector = vector; slot_irq->handler = handler; slot_irq->arg = arg; - if (dev->board_name) { - if (strlen(dev->board_name) > IPACK_IRQ_NAME_SIZE) { - pr_warning("Slot [%s %d:%d] IRQ name too long (%d char > %d char MAX). Will be truncated!\n", - TPCI200_SHORTNAME, dev->bus_nr, dev->slot, - (int)strlen(dev->board_name), - IPACK_IRQ_NAME_SIZE); - } - strncpy(slot_irq->name, dev->board_name, IPACK_IRQ_NAME_SIZE-1); - } else { - strcpy(slot_irq->name, "Unknown"); - } + slot_irq->name = dev_name(&dev->dev); tpci200->slots[dev->slot].irq = slot_irq; res = __tpci200_request_irq(tpci200, dev); diff --git a/drivers/staging/ipack/bridges/tpci200.h b/drivers/staging/ipack/bridges/tpci200.h index e3a7e5d1cfeb..7eb994d127c9 100644 --- a/drivers/staging/ipack/bridges/tpci200.h +++ b/drivers/staging/ipack/bridges/tpci200.h @@ -112,10 +112,10 @@ * */ struct slot_irq { - int vector; - int (*handler)(void *); - void *arg; - char name[IPACK_IRQ_NAME_SIZE]; + int vector; + int (*handler)(void *); + void *arg; + const char *name; }; /** diff --git a/drivers/staging/ipack/ipack.h b/drivers/staging/ipack/ipack.h index d50af7139569..8bc001e3ca4e 100644 --- a/drivers/staging/ipack/ipack.h +++ b/drivers/staging/ipack/ipack.h @@ -11,8 +11,6 @@ #include <linux/device.h> -#define IPACK_BOARD_NAME_SIZE 16 -#define IPACK_IRQ_NAME_SIZE 50 #define IPACK_IDPROM_OFFSET_I 0x01 #define IPACK_IDPROM_OFFSET_P 0x03 #define IPACK_IDPROM_OFFSET_A 0x05 @@ -64,8 +62,6 @@ struct ipack_addr_space { * by the carrier board throught bus->ops. */ struct ipack_device { - char board_name[IPACK_BOARD_NAME_SIZE]; - char bus_name[IPACK_BOARD_NAME_SIZE]; unsigned int bus_nr; unsigned int slot; unsigned int irq; |