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

Commit 317b6d63 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: dev_node removal (write-only drivers) 



dev_node_t was only used to transport some minor/major numbers
from the PCMCIA device drivers to deprecated userspace helpers.
However, only a few drivers made use of it, and the userspace
helpers are deprecated anyways. Therefore, get rid of dev_node_t .

As a first step, remove any usage of dev_node_t from drivers which
only wrote to this typedef/struct, but did not make use of it.

CC: linux-bluetooth@vger.kernel.org
CC: Harald Welte <laforge@gnumonks.org>
CC: linux-mtd@lists.infradead.org
CC: linux-wireless@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: alsa-devel@alsa-project.org
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent b1577190

drivers/bluetooth/bluecard_cs.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -65,7 +65,6 @@ MODULE_LICENSE("GPL"); 




typedef struct bluecard_info_t {

typedef struct bluecard_info_t {

	struct pcmcia_device *p_dev;

	struct pcmcia_device *p_dev;

	dev_node_t node;





	struct hci_dev *hdev;

	struct hci_dev *hdev;
@@ -916,9 +915,6 @@ static int bluecard_config(struct pcmcia_device *link) 
	if (bluecard_open(info) != 0)

	if (bluecard_open(info) != 0)

		goto failed;

		goto failed;





	strcpy(info->node.dev_name, info->hdev->name);

	link->dev_node = &info->node;



	return 0;

	return 0;





failed:

failed:

drivers/bluetooth/bt3c_cs.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ MODULE_FIRMWARE("BT3CPCC.bin"); 




typedef struct bt3c_info_t {

typedef struct bt3c_info_t {

	struct pcmcia_device *p_dev;

	struct pcmcia_device *p_dev;

	dev_node_t node;





	struct hci_dev *hdev;

	struct hci_dev *hdev;
@@ -751,9 +750,6 @@ found_port: 
	if (bt3c_open(info) != 0)

	if (bt3c_open(info) != 0)

		goto failed;

		goto failed;





	strcpy(info->node.dev_name, info->hdev->name);

	link->dev_node = &info->node;



	return 0;

	return 0;





failed:

failed:

drivers/bluetooth/btuart_cs.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -67,7 +67,6 @@ MODULE_LICENSE("GPL"); 




typedef struct btuart_info_t {

typedef struct btuart_info_t {

	struct pcmcia_device *p_dev;

	struct pcmcia_device *p_dev;

	dev_node_t node;





	struct hci_dev *hdev;

	struct hci_dev *hdev;
@@ -680,9 +679,6 @@ found_port: 
	if (btuart_open(info) != 0)

	if (btuart_open(info) != 0)

		goto failed;

		goto failed;





	strcpy(info->node.dev_name, info->hdev->name);

	link->dev_node = &info->node;



	return 0;

	return 0;





failed:

failed:

drivers/bluetooth/dtl1_cs.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -67,7 +67,6 @@ MODULE_LICENSE("GPL"); 




typedef struct dtl1_info_t {

typedef struct dtl1_info_t {

	struct pcmcia_device *p_dev;

	struct pcmcia_device *p_dev;

	dev_node_t node;





	struct hci_dev *hdev;

	struct hci_dev *hdev;
@@ -629,9 +628,6 @@ static int dtl1_config(struct pcmcia_device *link) 
	if (dtl1_open(info) != 0)

	if (dtl1_open(info) != 0)

		goto failed;

		goto failed;





	strcpy(info->node.dev_name, info->hdev->name);

	link->dev_node = &info->node;



	return 0;

	return 0;





failed:

failed:

drivers/char/pcmcia/cm4040_cs.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ static struct class *cmx_class; 




struct reader_dev {

struct reader_dev {

	struct pcmcia_device	*p_dev;

	struct pcmcia_device	*p_dev;

	dev_node_t		node;

	wait_queue_head_t	devq;

	wait_queue_head_t	devq;

	wait_queue_head_t	poll_wait;

	wait_queue_head_t	poll_wait;

	wait_queue_head_t	read_wait;

	wait_queue_head_t	read_wait;
@@ -568,10 +567,6 @@ static int reader_config(struct pcmcia_device *link, int devno) 
	}

	}





	dev = link->priv;

	dev = link->priv;

	sprintf(dev->node.dev_name, DEVICE_NAME "%d", devno);

	dev->node.major = major;

	dev->node.minor = devno;

	dev->node.next = &dev->node;





	DEBUGP(2, dev, "device " DEVICE_NAME "%d at 0x%.4x-0x%.4x\n", devno,

	DEBUGP(2, dev, "device " DEVICE_NAME "%d at 0x%.4x-0x%.4x\n", devno,

	      link->io.BasePort1, link->io.BasePort1+link->io.NumPorts1);

	      link->io.BasePort1, link->io.BasePort1+link->io.NumPorts1);