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

Commit 611b564d authored by Samuel Iglesias Gonsalvez's avatar Samuel Iglesias Gonsalvez Committed by Greg Kroah-Hartman
Browse files

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: default avatarSamuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec440335

drivers/staging/ipack/bridges/tpci200.c

+4 −16
Original line number Diff line number Diff line
@@ -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);

drivers/staging/ipack/bridges/tpci200.h

+4 −4
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ struct slot_irq { 
	int		vector;

	int		(*handler)(void *);

	void		*arg;

	char         name[IPACK_IRQ_NAME_SIZE];

	const char	*name;

};



/**

drivers/staging/ipack/ipack.h

+0 −4
Original line number Diff line number Diff line
@@ -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;