Drivers: media: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -151,7 +151,8 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit hopper_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
|
||||
static int hopper_pci_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
struct mantis_pci *mantis;
|
||||
struct mantis_hwconfig *config;
|
||||
@@ -230,7 +231,7 @@ fail0:
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __devexit hopper_pci_remove(struct pci_dev *pdev)
|
||||
static void hopper_pci_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct mantis_pci *mantis = pci_get_drvdata(pdev);
|
||||
|
||||
@@ -259,12 +260,12 @@ static struct pci_driver hopper_pci_driver = {
|
||||
.remove = hopper_pci_remove,
|
||||
};
|
||||
|
||||
static int __devinit hopper_init(void)
|
||||
static int hopper_init(void)
|
||||
{
|
||||
return pci_register_driver(&hopper_pci_driver);
|
||||
}
|
||||
|
||||
static void __devexit hopper_exit(void)
|
||||
static void hopper_exit(void)
|
||||
{
|
||||
return pci_unregister_driver(&hopper_pci_driver);
|
||||
}
|
||||
|
@@ -159,7 +159,8 @@ static irqreturn_t mantis_irq_handler(int irq, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit mantis_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
|
||||
static int mantis_pci_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
struct mantis_pci *mantis;
|
||||
struct mantis_hwconfig *config;
|
||||
@@ -249,7 +250,7 @@ fail0:
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __devexit mantis_pci_remove(struct pci_dev *pdev)
|
||||
static void mantis_pci_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct mantis_pci *mantis = pci_get_drvdata(pdev);
|
||||
|
||||
@@ -289,12 +290,12 @@ static struct pci_driver mantis_pci_driver = {
|
||||
.remove = mantis_pci_remove,
|
||||
};
|
||||
|
||||
static int __devinit mantis_init(void)
|
||||
static int mantis_init(void)
|
||||
{
|
||||
return pci_register_driver(&mantis_pci_driver);
|
||||
}
|
||||
|
||||
static void __devexit mantis_exit(void)
|
||||
static void mantis_exit(void)
|
||||
{
|
||||
return pci_unregister_driver(&mantis_pci_driver);
|
||||
}
|
||||
|
@@ -144,7 +144,7 @@ static int mantis_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit mantis_dvb_init(struct mantis_pci *mantis)
|
||||
int mantis_dvb_init(struct mantis_pci *mantis)
|
||||
{
|
||||
struct mantis_hwconfig *config = mantis->hwconfig;
|
||||
int result = -1;
|
||||
@@ -271,7 +271,7 @@ err0:
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mantis_dvb_init);
|
||||
|
||||
int __devexit mantis_dvb_exit(struct mantis_pci *mantis)
|
||||
int mantis_dvb_exit(struct mantis_pci *mantis)
|
||||
{
|
||||
int err;
|
||||
|
||||
|
@@ -217,7 +217,7 @@ static struct i2c_algorithm mantis_algo = {
|
||||
.functionality = mantis_i2c_func,
|
||||
};
|
||||
|
||||
int __devinit mantis_i2c_init(struct mantis_pci *mantis)
|
||||
int mantis_i2c_init(struct mantis_pci *mantis)
|
||||
{
|
||||
u32 intstat, intmask;
|
||||
struct i2c_adapter *i2c_adapter = &mantis->adapter;
|
||||
|
@@ -46,7 +46,7 @@
|
||||
|
||||
#define DRIVER_NAME "Mantis Core"
|
||||
|
||||
int __devinit mantis_pci_init(struct mantis_pci *mantis)
|
||||
int mantis_pci_init(struct mantis_pci *mantis)
|
||||
{
|
||||
u8 latency;
|
||||
struct mantis_hwconfig *config = mantis->hwconfig;
|
||||
|
Reference in New Issue
Block a user