From: Bill Pemberton <wfp5p@virginia.edu>
To: gregkh@linuxfoundation.org
Cc: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 215/493] drivers/macintosh: remove use of __devinit
Date: Mon, 19 Nov 2012 13:22:44 -0500 [thread overview]
Message-ID: <1353349642-3677-215-git-send-email-wfp5p@virginia.edu> (raw)
In-Reply-To: <1353349642-3677-1-git-send-email-wfp5p@virginia.edu>
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
---
drivers/macintosh/macio_asic.c | 2 +-
drivers/macintosh/mediabay.c | 2 +-
drivers/macintosh/rack-meter.c | 6 +++---
drivers/macintosh/windfarm_ad7417_sensor.c | 8 ++++----
drivers/macintosh/windfarm_fcu_controls.c | 14 +++++++-------
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index ef87310..2cdbd47 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -679,7 +679,7 @@ void macio_release_resources(struct macio_dev *dev)
#ifdef CONFIG_PCI
-static int __devinit macio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int macio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
struct device_node* np;
struct macio_chip* chip;
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 3f8d032..7d2422a 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -556,7 +556,7 @@ static int media_bay_task(void *x)
return 0;
}
-static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_device_id *match)
+static int media_bay_attach(struct macio_dev *mdev, const struct of_device_id *match)
{
struct media_bay_info* bay;
u32 __iomem *regbase;
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 18cd177..3b4453f 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -253,7 +253,7 @@ static void rackmeter_do_timer(struct work_struct *work)
msecs_to_jiffies(CPU_SAMPLING_RATE));
}
-static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
+static void rackmeter_init_cpu_sniffer(struct rackmeter *rm)
{
unsigned int cpu;
@@ -287,7 +287,7 @@ static void rackmeter_stop_cpu_sniffer(struct rackmeter *rm)
cancel_delayed_work_sync(&rm->cpu[1].sniffer);
}
-static int __devinit rackmeter_setup(struct rackmeter *rm)
+static int rackmeter_setup(struct rackmeter *rm)
{
pr_debug("rackmeter: setting up i2s..\n");
rackmeter_setup_i2s(rm);
@@ -362,7 +362,7 @@ static irqreturn_t rackmeter_irq(int irq, void *arg)
return IRQ_HANDLED;
}
-static int __devinit rackmeter_probe(struct macio_dev* mdev,
+static int rackmeter_probe(struct macio_dev* mdev,
const struct of_device_id *match)
{
struct device_node *i2s = NULL, *np = NULL;
diff --git a/drivers/macintosh/windfarm_ad7417_sensor.c b/drivers/macintosh/windfarm_ad7417_sensor.c
index ac3f243..d0aa631 100644
--- a/drivers/macintosh/windfarm_ad7417_sensor.c
+++ b/drivers/macintosh/windfarm_ad7417_sensor.c
@@ -177,7 +177,7 @@ static const struct wf_sensor_ops wf_ad7417_adc_ops = {
.owner = THIS_MODULE,
};
-static void __devinit wf_ad7417_add_sensor(struct wf_ad7417_priv *pv,
+static void wf_ad7417_add_sensor(struct wf_ad7417_priv *pv,
int index, const char *name,
const struct wf_sensor_ops *ops)
{
@@ -188,7 +188,7 @@ static void __devinit wf_ad7417_add_sensor(struct wf_ad7417_priv *pv,
kref_get(&pv->ref);
}
-static void __devinit wf_ad7417_init_chip(struct wf_ad7417_priv *pv)
+static void wf_ad7417_init_chip(struct wf_ad7417_priv *pv)
{
int rc;
u8 buf[2];
@@ -230,7 +230,7 @@ static void __devinit wf_ad7417_init_chip(struct wf_ad7417_priv *pv)
pv->config = config;
}
-static int __devinit wf_ad7417_probe(struct i2c_client *client,
+static int wf_ad7417_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct wf_ad7417_priv *pv;
@@ -322,7 +322,7 @@ static struct i2c_driver wf_ad7417_driver = {
.id_table = wf_ad7417_id,
};
-static int __devinit wf_ad7417_init(void)
+static int wf_ad7417_init(void)
{
/* This is only supported on these machines */
if (!of_machine_is_compatible("PowerMac7,2") &&
diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c
index fd6ed15..84354d5 100644
--- a/drivers/macintosh/windfarm_fcu_controls.c
+++ b/drivers/macintosh/windfarm_fcu_controls.c
@@ -282,7 +282,7 @@ static const struct wf_control_ops wf_fcu_fan_pwm_ops = {
.owner = THIS_MODULE,
};
-static void __devinit wf_fcu_get_pump_minmax(struct wf_fcu_fan *fan)
+static void wf_fcu_get_pump_minmax(struct wf_fcu_fan *fan)
{
const struct mpu_data *mpu = wf_get_mpu(0);
u16 pump_min = 0, pump_max = 0xffff;
@@ -317,7 +317,7 @@ static void __devinit wf_fcu_get_pump_minmax(struct wf_fcu_fan *fan)
fan->ctrl.name, pump_min, pump_max);
}
-static void __devinit wf_fcu_get_rpmfan_minmax(struct wf_fcu_fan *fan)
+static void wf_fcu_get_rpmfan_minmax(struct wf_fcu_fan *fan)
{
struct wf_fcu_priv *pv = fan->fcu_priv;
const struct mpu_data *mpu0 = wf_get_mpu(0);
@@ -359,7 +359,7 @@ static void __devinit wf_fcu_get_rpmfan_minmax(struct wf_fcu_fan *fan)
fan->ctrl.name, fan->min, fan->max);
}
-static void __devinit wf_fcu_add_fan(struct wf_fcu_priv *pv,
+static void wf_fcu_add_fan(struct wf_fcu_priv *pv,
const char *name,
int type, int id)
{
@@ -399,7 +399,7 @@ static void __devinit wf_fcu_add_fan(struct wf_fcu_priv *pv,
kref_get(&pv->ref);
}
-static void __devinit wf_fcu_lookup_fans(struct wf_fcu_priv *pv)
+static void wf_fcu_lookup_fans(struct wf_fcu_priv *pv)
{
/* Translation of device-tree location properties to
* windfarm fan names
@@ -481,7 +481,7 @@ static void __devinit wf_fcu_lookup_fans(struct wf_fcu_priv *pv)
}
}
-static void __devinit wf_fcu_default_fans(struct wf_fcu_priv *pv)
+static void wf_fcu_default_fans(struct wf_fcu_priv *pv)
{
/* We only support the default fans for PowerMac7,2 */
if (!of_machine_is_compatible("PowerMac7,2"))
@@ -496,7 +496,7 @@ static void __devinit wf_fcu_default_fans(struct wf_fcu_priv *pv)
wf_fcu_add_fan(pv, "cpu-rear-fan-1", FCU_FAN_RPM, 6);
}
-static int __devinit wf_fcu_init_chip(struct wf_fcu_priv *pv)
+static int wf_fcu_init_chip(struct wf_fcu_priv *pv)
{
unsigned char buf = 0xff;
int rc;
@@ -518,7 +518,7 @@ static int __devinit wf_fcu_init_chip(struct wf_fcu_priv *pv)
return 0;
}
-static int __devinit wf_fcu_probe(struct i2c_client *client,
+static int wf_fcu_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct wf_fcu_priv *pv;
--
1.8.0
next prev parent reply other threads:[~2012-11-19 18:32 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1353349642-3677-1-git-send-email-wfp5p@virginia.edu>
2012-11-19 18:19 ` [PATCH 014/493] PCI: remove CONFIG_HOTPLUG ifdefs Bill Pemberton
2012-11-19 18:19 ` [PATCH 024/493] powerpc: " Bill Pemberton
2012-11-19 18:19 ` [PATCH 035/493] powerpc: remove use of __devexit_p Bill Pemberton
2012-11-19 18:20 ` [PATCH 056/493] edac: " Bill Pemberton
2012-11-22 13:44 ` Borislav Petkov
2012-11-22 18:22 ` Greg KH
2012-11-23 10:06 ` Borislav Petkov
2012-11-23 16:40 ` Greg KH
2012-11-24 9:14 ` Borislav Petkov
2012-11-24 17:59 ` Greg KH
2012-11-19 18:20 ` [PATCH 065/493] i2c: " Bill Pemberton
2012-11-20 6:59 ` Shubhrajyoti Datta
2012-11-20 13:46 ` Jean Delvare
2012-11-22 21:49 ` Wolfram Sang
2012-11-26 13:52 ` Bill Pemberton
2012-11-19 18:20 ` [PATCH 072/493] drivers/macintosh: " Bill Pemberton
2012-11-19 18:21 ` [PATCH 117/493] tty: " Bill Pemberton
2012-11-19 18:21 ` [PATCH 119/493] usb: " Bill Pemberton
2012-11-19 20:14 ` Felipe Balbi
2012-11-20 9:29 ` Nicolas Ferre
2012-11-20 14:02 ` Peter Korsgaard
2012-11-19 18:21 ` [PATCH 146/493] ASoC: " Bill Pemberton
[not found] ` <s5hehjordzj.wl%tiwai@suse.de>
2012-11-20 6:30 ` Forward: " Mark Brown
2012-11-19 18:21 ` [PATCH 158/493] video: remove use of __devinit Bill Pemberton
2012-11-20 16:57 ` David Brown
2012-11-19 18:21 ` [PATCH 159/493] usb: " Bill Pemberton
2012-11-19 20:15 ` Felipe Balbi
2012-11-20 9:33 ` Nicolas Ferre
2012-11-20 21:44 ` Alan Stern
2012-11-19 18:21 ` [PATCH 161/493] tty: " Bill Pemberton
2012-11-20 9:34 ` Nicolas Ferre
2012-11-20 9:44 ` Tobias Klauser
2012-11-19 18:22 ` [PATCH 192/493] scsi: " Bill Pemberton
2012-11-21 11:51 ` Russell King - ARM Linux
2012-11-21 12:13 ` Guennadi Liakhovetski
2012-11-26 17:37 ` [Pv-drivers] " Dmitry Torokhov
2012-11-27 11:32 ` vinayak holikatti
2012-11-19 18:22 ` [PATCH 198/493] ethernet: " Bill Pemberton
2012-11-21 11:55 ` Russell King - ARM Linux
2012-11-19 18:22 ` [PATCH 207/493] i2c: " Bill Pemberton
2012-11-20 8:20 ` Jean Delvare
2012-11-20 13:23 ` Russell King - ARM Linux
2012-11-20 13:37 ` Jean Delvare
2012-11-21 11:02 ` Barry Song
2012-11-19 18:22 ` [PATCH 211/493] hwrng: " Bill Pemberton
2012-11-19 18:22 ` Bill Pemberton [this message]
2012-11-19 18:22 ` [PATCH 222/493] char: " Bill Pemberton
2012-11-19 18:22 ` [PATCH 226/493] dma: " Bill Pemberton
2012-11-20 3:07 ` viresh kumar
2012-11-19 18:22 ` [PATCH 227/493] edac: " Bill Pemberton
2012-11-19 18:23 ` [PATCH 238/493] mtd: " Bill Pemberton
2012-11-21 11:58 ` Russell King - ARM Linux
2012-11-19 18:23 ` [PATCH 244/493] ps3: " Bill Pemberton
2012-11-19 18:23 ` [PATCH 247/493] drivers/block: " Bill Pemberton
2012-11-19 18:23 ` [PATCH 261/493] sound: " Bill Pemberton
2012-11-19 18:23 ` [PATCH 283/493] powerpc: " Bill Pemberton
2012-11-19 18:24 ` [PATCH 295/493] tty: remove use of __devinitdata Bill Pemberton
2012-11-19 18:24 ` [PATCH 298/493] video: " Bill Pemberton
2012-11-21 12:00 ` Russell King - ARM Linux
2012-11-19 18:24 ` [PATCH 323/493] tty: " Bill Pemberton
2012-11-19 18:24 ` [PATCH 344/493] powerpc: " Bill Pemberton
2012-11-19 18:25 ` [PATCH 371/493] usb: remove use of __devinitconst Bill Pemberton
2012-11-19 20:16 ` Felipe Balbi
2012-11-19 18:25 ` [PATCH 373/493] drivers/macintosh: " Bill Pemberton
2012-11-19 18:25 ` [PATCH 382/493] powerpc: " Bill Pemberton
2012-11-19 18:25 ` [PATCH 399/493] edac: remove use of __devexit Bill Pemberton
2012-11-19 18:25 ` [PATCH 404/493] i2c: " Bill Pemberton
2012-11-19 18:26 ` [PATCH 415/493] mtd: " Bill Pemberton
2012-11-19 18:26 ` [PATCH 429/493] tty: " Bill Pemberton
2012-11-20 9:45 ` Tobias Klauser
2012-11-20 17:06 ` David Brown
2012-11-19 18:26 ` [PATCH 431/493] usb: " Bill Pemberton
2012-11-19 20:17 ` Felipe Balbi
2012-11-19 18:26 ` [PATCH 437/493] char: " Bill Pemberton
2012-11-26 20:36 ` Kent Yoder
2012-11-19 18:26 ` [PATCH 443/493] drivers/macintosh: " Bill Pemberton
2012-11-19 18:27 ` [PATCH 486/493] powerpc: " Bill Pemberton
2012-11-19 18:27 ` [PATCH 491/493] sound: " Bill Pemberton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353349642-3677-215-git-send-email-wfp5p@virginia.edu \
--to=wfp5p@virginia.edu \
--cc=gregkh@linuxfoundation.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).