i2c: remove __dev* attributes from subsystem
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Peter Korsgaard <peter.korsgaard@barco.com> (for ocores and mux-gpio) Acked-by: Havard Skinnemoen <hskinnemoen@gmail.com> (for i2c-gpio) Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> (for puf3) Acked-by: Barry Song <baohua.song@csr.com> (for sirf) Reviewed-by: Jean Delvare <khali@linux-fr.org> [wsa: Fixed "foo* bar" flaws while we are here] Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
このコミットが含まれているのは:
@@ -117,7 +117,7 @@ struct nforce2_smbus {
|
||||
#define MAX_TIMEOUT 100
|
||||
|
||||
/* We disable the second SMBus channel on these boards */
|
||||
static struct dmi_system_id __devinitdata nforce2_dmi_blacklist2[] = {
|
||||
static const struct dmi_system_id nforce2_dmi_blacklist2[] = {
|
||||
{
|
||||
.ident = "DFI Lanparty NF4 Expert",
|
||||
.matches = {
|
||||
@@ -330,8 +330,8 @@ static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {
|
||||
MODULE_DEVICE_TABLE (pci, nforce2_ids);
|
||||
|
||||
|
||||
static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,
|
||||
int alt_reg, struct nforce2_smbus *smbus, const char *name)
|
||||
static int nforce2_probe_smb(struct pci_dev *dev, int bar, int alt_reg,
|
||||
struct nforce2_smbus *smbus, const char *name)
|
||||
{
|
||||
int error;
|
||||
|
||||
@@ -382,7 +382,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,
|
||||
}
|
||||
|
||||
|
||||
static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
||||
static int nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
||||
{
|
||||
struct nforce2_smbus *smbuses;
|
||||
int res1, res2;
|
||||
@@ -430,7 +430,7 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_
|
||||
}
|
||||
|
||||
|
||||
static void __devexit nforce2_remove(struct pci_dev *dev)
|
||||
static void nforce2_remove(struct pci_dev *dev)
|
||||
{
|
||||
struct nforce2_smbus *smbuses = pci_get_drvdata(dev);
|
||||
|
||||
@@ -450,7 +450,7 @@ static struct pci_driver nforce2_driver = {
|
||||
.name = "nForce2_smbus",
|
||||
.id_table = nforce2_ids,
|
||||
.probe = nforce2_probe,
|
||||
.remove = __devexit_p(nforce2_remove),
|
||||
.remove = nforce2_remove,
|
||||
};
|
||||
|
||||
module_pci_driver(nforce2_driver);
|
||||
|
新しいイシューから参照
ユーザーをブロックする