Commit 2ea21492 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 



John W. Linville says:

====================
This is a batch of updates intended for 3.7.  The ath9k, mwifiex,
and b43 drivers get the bulk of the commits this time, with a handful
of other driver bits thrown-in.  It is mostly just minor fixes and
cleanups, etc.

Also included is a Bluetooth pull, with a lot of refactoring.
Gustavo says:

	"These are the changes I queued for 3.7. There are a many
	small fixes/improvements by Andre Guedes. A l2cap channel
	refcounting refactor by Jaganath. Bluetooth sockets now
	appears in /proc/net, by Masatake Yamato and Sachin Kamat
	changes ours drivers to use devm_kzalloc()."
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1b3a6926 16698918

drivers/bcma/driver_chipcommon_pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable) 
	bcma_cc_write32(cc, BCMA_CC_CHIPCTL, val);

}



void bcma_pmu_workarounds(struct bcma_drv_cc *cc)

static void bcma_pmu_workarounds(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;
@@ -257,7 +257,7 @@ static u32 bcma_pmu_clock_bcm4706(struct bcma_drv_cc *cc, u32 pll0, u32 m) 
}



/* query bus clock frequency for PMU-enabled chipcommon */

u32 bcma_pmu_get_clockcontrol(struct bcma_drv_cc *cc)

static u32 bcma_pmu_get_clockcontrol(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;

drivers/bcma/host_pci.c

+6 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void bcma_host_pci_write32(struct bcma_device *core, u16 offset, 
}



#ifdef CONFIG_BCMA_BLOCKIO

void bcma_host_pci_block_read(struct bcma_device *core, void *buffer,

static void bcma_host_pci_block_read(struct bcma_device *core, void *buffer,

				     size_t count, u16 offset, u8 reg_width)

{

	void __iomem *addr = core->bus->mmio + offset;
@@ -100,8 +100,9 @@ void bcma_host_pci_block_read(struct bcma_device *core, void *buffer, 
	}

}



void bcma_host_pci_block_write(struct bcma_device *core, const void *buffer,

			       size_t count, u16 offset, u8 reg_width)

static void bcma_host_pci_block_write(struct bcma_device *core,

				      const void *buffer, size_t count,

				      u16 offset, u8 reg_width)

{

	void __iomem *addr = core->bus->mmio + offset;

	if (core->bus->mapped_core != core)
@@ -139,7 +140,7 @@ static void bcma_host_pci_awrite32(struct bcma_device *core, u16 offset, 
	iowrite32(value, core->bus->mmio + (1 * BCMA_CORE_SIZE) + offset);

}



const struct bcma_host_ops bcma_host_pci_ops = {

static const struct bcma_host_ops bcma_host_pci_ops = {

	.read8		= bcma_host_pci_read8,

	.read16		= bcma_host_pci_read16,

	.read32		= bcma_host_pci_read32,

drivers/bcma/host_soc.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static void bcma_host_soc_awrite32(struct bcma_device *core, u16 offset, 
	writel(value, core->io_wrap + offset);

}



const struct bcma_host_ops bcma_host_soc_ops = {

static const struct bcma_host_ops bcma_host_soc_ops = {

	.read8		= bcma_host_soc_read8,

	.read16		= bcma_host_soc_read16,

	.read32		= bcma_host_soc_read32,

drivers/bluetooth/bcm203x.c

+1 −7
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
	if (intf->cur_altsetting->desc.bInterfaceNumber != 0)

		return -ENODEV;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);

	if (!data) {

		BT_ERR("Can't allocate memory for data structure");

		return -ENOMEM;
@@ -189,14 +189,12 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
	data->urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!data->urb) {

		BT_ERR("Can't allocate URB");

		kfree(data);

		return -ENOMEM;

	}



	if (request_firmware(&firmware, "BCM2033-MD.hex", &udev->dev) < 0) {

		BT_ERR("Mini driver request failed");

		usb_free_urb(data->urb);

		kfree(data);

		return -EIO;

	}
@@ -209,7 +207,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		BT_ERR("Can't allocate memory for mini driver");

		release_firmware(firmware);

		usb_free_urb(data->urb);

		kfree(data);

		return -ENOMEM;

	}
@@ -224,7 +221,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		BT_ERR("Firmware request failed");

		usb_free_urb(data->urb);

		kfree(data->buffer);

		kfree(data);

		return -EIO;

	}
@@ -236,7 +232,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		release_firmware(firmware);

		usb_free_urb(data->urb);

		kfree(data->buffer);

		kfree(data);

		return -ENOMEM;

	}
@@ -271,7 +266,6 @@ static void bcm203x_disconnect(struct usb_interface *intf) 
	usb_free_urb(data->urb);

	kfree(data->fw_data);

	kfree(data->buffer);

	kfree(data);

}



static struct usb_driver bcm203x_driver = {

drivers/bluetooth/bfusb.c

+4 −8
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	}



	/* Initialize control structure and load firmware */

	data = kzalloc(sizeof(struct bfusb_data), GFP_KERNEL);

	data = devm_kzalloc(&intf->dev, sizeof(struct bfusb_data), GFP_KERNEL);

	if (!data) {

		BT_ERR("Can't allocate memory for control structure");

		goto done;
@@ -674,7 +674,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 


	if (request_firmware(&firmware, "bfubase.frm", &udev->dev) < 0) {

		BT_ERR("Firmware request failed");

		goto error;

		goto done;

	}



	BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
@@ -690,7 +690,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	hdev = hci_alloc_dev();

	if (!hdev) {

		BT_ERR("Can't allocate HCI device");

		goto error;

		goto done;

	}



	data->hdev = hdev;
@@ -708,7 +708,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	if (hci_register_dev(hdev) < 0) {

		BT_ERR("Can't register HCI device");

		hci_free_dev(hdev);

		goto error;

		goto done;

	}



	usb_set_intfdata(intf, data);
@@ -718,9 +718,6 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
release:

	release_firmware(firmware);



error:

	kfree(data);



done:

	return -EIO;

}
@@ -741,7 +738,6 @@ static void bfusb_disconnect(struct usb_interface *intf) 


	hci_unregister_dev(hdev);

	hci_free_dev(hdev);

	kfree(data);

}



static struct usb_driver bfusb_driver = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE