|
@@ -62,7 +62,7 @@ MODULE_LICENSE("GPL");
|
|
|
/* ======================== Local structures ======================== */
|
|
|
|
|
|
|
|
|
-typedef struct btuart_info_t {
|
|
|
+struct btuart_info {
|
|
|
struct pcmcia_device *p_dev;
|
|
|
|
|
|
struct hci_dev *hdev;
|
|
@@ -75,7 +75,7 @@ typedef struct btuart_info_t {
|
|
|
unsigned long rx_state;
|
|
|
unsigned long rx_count;
|
|
|
struct sk_buff *rx_skb;
|
|
|
-} btuart_info_t;
|
|
|
+};
|
|
|
|
|
|
|
|
|
static int btuart_config(struct pcmcia_device *link);
|
|
@@ -127,7 +127,7 @@ static int btuart_write(unsigned int iobase, int fifo_size, __u8 *buf, int len)
|
|
|
}
|
|
|
|
|
|
|
|
|
-static void btuart_write_wakeup(btuart_info_t *info)
|
|
|
+static void btuart_write_wakeup(struct btuart_info *info)
|
|
|
{
|
|
|
if (!info) {
|
|
|
BT_ERR("Unknown device");
|
|
@@ -172,7 +172,7 @@ static void btuart_write_wakeup(btuart_info_t *info)
|
|
|
}
|
|
|
|
|
|
|
|
|
-static void btuart_receive(btuart_info_t *info)
|
|
|
+static void btuart_receive(struct btuart_info *info)
|
|
|
{
|
|
|
unsigned int iobase;
|
|
|
int boguscount = 0;
|
|
@@ -286,7 +286,7 @@ static void btuart_receive(btuart_info_t *info)
|
|
|
|
|
|
static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
|
|
|
{
|
|
|
- btuart_info_t *info = dev_inst;
|
|
|
+ struct btuart_info *info = dev_inst;
|
|
|
unsigned int iobase;
|
|
|
int boguscount = 0;
|
|
|
int iir, lsr;
|
|
@@ -340,7 +340,8 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
|
|
|
}
|
|
|
|
|
|
|
|
|
-static void btuart_change_speed(btuart_info_t *info, unsigned int speed)
|
|
|
+static void btuart_change_speed(struct btuart_info *info,
|
|
|
+ unsigned int speed)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
unsigned int iobase;
|
|
@@ -397,7 +398,7 @@ static void btuart_change_speed(btuart_info_t *info, unsigned int speed)
|
|
|
|
|
|
static int btuart_hci_flush(struct hci_dev *hdev)
|
|
|
{
|
|
|
- btuart_info_t *info = hci_get_drvdata(hdev);
|
|
|
+ struct btuart_info *info = hci_get_drvdata(hdev);
|
|
|
|
|
|
/* Drop TX queue */
|
|
|
skb_queue_purge(&(info->txq));
|
|
@@ -427,7 +428,7 @@ static int btuart_hci_close(struct hci_dev *hdev)
|
|
|
|
|
|
static int btuart_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|
|
{
|
|
|
- btuart_info_t *info = hci_get_drvdata(hdev);
|
|
|
+ struct btuart_info *info = hci_get_drvdata(hdev);
|
|
|
|
|
|
switch (bt_cb(skb)->pkt_type) {
|
|
|
case HCI_COMMAND_PKT:
|
|
@@ -455,7 +456,7 @@ static int btuart_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|
|
/* ======================== Card services HCI interaction ======================== */
|
|
|
|
|
|
|
|
|
-static int btuart_open(btuart_info_t *info)
|
|
|
+static int btuart_open(struct btuart_info *info)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
unsigned int iobase = info->p_dev->resource[0]->start;
|
|
@@ -521,7 +522,7 @@ static int btuart_open(btuart_info_t *info)
|
|
|
}
|
|
|
|
|
|
|
|
|
-static int btuart_close(btuart_info_t *info)
|
|
|
+static int btuart_close(struct btuart_info *info)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
unsigned int iobase = info->p_dev->resource[0]->start;
|
|
@@ -550,7 +551,7 @@ static int btuart_close(btuart_info_t *info)
|
|
|
|
|
|
static int btuart_probe(struct pcmcia_device *link)
|
|
|
{
|
|
|
- btuart_info_t *info;
|
|
|
+ struct btuart_info *info;
|
|
|
|
|
|
/* Create new info device */
|
|
|
info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
|
|
@@ -613,7 +614,7 @@ static int btuart_check_config_notpicky(struct pcmcia_device *p_dev,
|
|
|
|
|
|
static int btuart_config(struct pcmcia_device *link)
|
|
|
{
|
|
|
- btuart_info_t *info = link->priv;
|
|
|
+ struct btuart_info *info = link->priv;
|
|
|
int i;
|
|
|
int try;
|
|
|
|
|
@@ -654,7 +655,7 @@ failed:
|
|
|
|
|
|
static void btuart_release(struct pcmcia_device *link)
|
|
|
{
|
|
|
- btuart_info_t *info = link->priv;
|
|
|
+ struct btuart_info *info = link->priv;
|
|
|
|
|
|
btuart_close(info);
|
|
|
|