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

Commit 440ddada authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Move Move pci_dev specific access to rt2x00pci 



pci_dev->irq and pci_name(pci_dev) access should be limited
to rt2x00pci only. This is more generic and allows a rt2x00 pci
driver to be controlled as PCI device but also as platform driver
(needed for rt2800pci SoC support).

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 32c1628f

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	 */

	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);

	rt2x00pci_register_read(rt2x00dev, CSR0, &reg);

	rt2x00_set_chip(rt2x00dev, RT2460, value, reg);

	rt2x00_set_chip_rf(rt2x00dev, value, reg);



	if (!rt2x00_rf(&rt2x00dev->chip, RF2420) &&

	    !rt2x00_rf(&rt2x00dev->chip, RF2421)) {

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1525,7 +1525,7 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	 */

	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);

	rt2x00pci_register_read(rt2x00dev, CSR0, &reg);

	rt2x00_set_chip(rt2x00dev, RT2560, value, reg);

	rt2x00_set_chip_rf(rt2x00dev, value, reg);



	if (!rt2x00_rf(&rt2x00dev->chip, RF2522) &&

	    !rt2x00_rf(&rt2x00dev->chip, RF2523) &&

drivers/net/wireless/rt2x00/rt2x00.h

+18 −0
Original line number Diff line number Diff line
@@ -671,6 +671,12 @@ struct rt2x00_dev { 
	 */

	unsigned long flags;



	/*

	 * Device information, Bus IRQ and name (PCI, SoC)

	 */

	int irq;

	const char *name;



	/*

	 * Chipset identification.

	 */
@@ -860,6 +866,18 @@ static inline void rt2x00_set_chip(struct rt2x00_dev *rt2x00dev, 
	rt2x00dev->chip.rev = rev;

}



static inline void rt2x00_set_chip_rt(struct rt2x00_dev *rt2x00dev,

				      const u16 rt)

{

	rt2x00dev->chip.rt = rt;

}



static inline void rt2x00_set_chip_rf(struct rt2x00_dev *rt2x00dev,

				      const u16 rf, const u32 rev)

{

	rt2x00_set_chip(rt2x00dev, rt2x00dev->chip.rt, rf, rev);

}



static inline char rt2x00_rt(const struct rt2x00_chip *chipset, const u16 chip)

{

	return (chipset->rt == chip);

drivers/net/wireless/rt2x00/rt2x00pci.c

+12 −4
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static void rt2x00pci_free_queue_dma(struct rt2x00_dev *rt2x00dev, 


int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)

{

	struct pci_dev *pci_dev = to_pci_dev(rt2x00dev->dev);

	struct data_queue *queue;

	int status;
@@ -186,11 +185,11 @@ int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Register interrupt handler.

	 */

	status = request_irq(pci_dev->irq, rt2x00dev->ops->lib->irq_handler,

			     IRQF_SHARED, pci_name(pci_dev), rt2x00dev);

	status = request_irq(rt2x00dev->irq, rt2x00dev->ops->lib->irq_handler,

			     IRQF_SHARED, rt2x00dev->name, rt2x00dev);

	if (status) {

		ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n",

		      pci_dev->irq, status);

		      rt2x00dev->irq, status);

		goto exit;

	}
@@ -270,6 +269,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 
	struct ieee80211_hw *hw;

	struct rt2x00_dev *rt2x00dev;

	int retval;

	u16 chip;



	retval = pci_request_regions(pci_dev, pci_name(pci_dev));

	if (retval) {
@@ -307,6 +307,14 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 
	rt2x00dev->dev = &pci_dev->dev;

	rt2x00dev->ops = ops;

	rt2x00dev->hw = hw;

	rt2x00dev->irq = pci_dev->irq;

	rt2x00dev->name = pci_name(pci_dev);



	/*

	 * Determine RT chipset by reading PCI header.

	 */

	pci_read_config_word(pci_dev, PCI_DEVICE_ID, &chip);

	rt2x00_set_chip_rt(rt2x00dev, chip);



	retval = rt2x00pci_alloc_reg(rt2x00dev);

	if (retval)

drivers/net/wireless/rt2x00/rt61pci.c

+1 −6
Original line number Diff line number Diff line
@@ -2308,7 +2308,6 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	u32 reg;

	u16 value;

	u16 eeprom;

	u16 device;



	/*

	 * Read EEPROM word for configuration.
@@ -2317,14 +2316,10 @@ static int rt61pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 


	/*

	 * Identify RF chipset.

	 * To determine the RT chip we have to read the

	 * PCI header of the device.

	 */

	pci_read_config_word(to_pci_dev(rt2x00dev->dev),

			     PCI_CONFIG_HEADER_DEVICE, &device);

	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);

	rt2x00pci_register_read(rt2x00dev, MAC_CSR0, &reg);

	rt2x00_set_chip(rt2x00dev, device, value, reg);

	rt2x00_set_chip_rf(rt2x00dev, value, reg);



	if (!rt2x00_rf(&rt2x00dev->chip, RF5225) &&

	    !rt2x00_rf(&rt2x00dev->chip, RF5325) &&