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

Commit 85368bb9 authored by Wolfram Sang's avatar Wolfram Sang Committed by Alexandre Belloni
Browse files

rtc: simplify getting .drvdata 



We should get drvdata from struct device directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Michal Simek <michal.simek@xilinx.com> (for zynqmp)
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 36d91a4d

drivers/rtc/rtc-bq4802.c

+2 −4
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ static void bq4802_write_mem(struct bq4802 *p, int off, u8 val) 


static int bq4802_read_time(struct device *dev, struct rtc_time *tm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct bq4802 *p = platform_get_drvdata(pdev);

	struct bq4802 *p = dev_get_drvdata(dev);

	unsigned long flags;

	unsigned int century;

	u8 val;
@@ -91,8 +90,7 @@ static int bq4802_read_time(struct device *dev, struct rtc_time *tm) 


static int bq4802_set_time(struct device *dev, struct rtc_time *tm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct bq4802 *p = platform_get_drvdata(pdev);

	struct bq4802 *p = dev_get_drvdata(dev);

	u8 sec, min, hrs, day, mon, yrs, century, val;

	unsigned long flags;

	unsigned int year;

drivers/rtc/rtc-ds1216.c

+2 −4
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ static void ds1216_switch_ds_to_clock(u8 __iomem *ioaddr) 


static int ds1216_rtc_read_time(struct device *dev, struct rtc_time *tm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1216_priv *priv = platform_get_drvdata(pdev);

	struct ds1216_priv *priv = dev_get_drvdata(dev);

	struct ds1216_regs regs;



	ds1216_switch_ds_to_clock(priv->ioaddr);
@@ -104,8 +103,7 @@ static int ds1216_rtc_read_time(struct device *dev, struct rtc_time *tm) 


static int ds1216_rtc_set_time(struct device *dev, struct rtc_time *tm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1216_priv *priv = platform_get_drvdata(pdev);

	struct ds1216_priv *priv = dev_get_drvdata(dev);

	struct ds1216_regs regs;



	ds1216_switch_ds_to_clock(priv->ioaddr);

drivers/rtc/rtc-ds1511.c

+3 −6
Original line number Diff line number Diff line
@@ -314,8 +314,7 @@ ds1511_rtc_update_alarm(struct rtc_plat_data *pdata) 
static int

ds1511_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);

	struct rtc_plat_data *pdata = dev_get_drvdata(dev);



	if (pdata->irq <= 0)

		return -EINVAL;
@@ -334,8 +333,7 @@ ds1511_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
static int

ds1511_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);

	struct rtc_plat_data *pdata = dev_get_drvdata(dev);



	if (pdata->irq <= 0)

		return -EINVAL;
@@ -373,8 +371,7 @@ ds1511_interrupt(int irq, void *dev_id) 


static int ds1511_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);

	struct rtc_plat_data *pdata = dev_get_drvdata(dev);



	if (pdata->irq <= 0)

		return -EINVAL;

drivers/rtc/rtc-ds1553.c

+5 −10
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ struct rtc_plat_data { 


static int ds1553_rtc_set_time(struct device *dev, struct rtc_time *tm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);

	struct rtc_plat_data *pdata = dev_get_drvdata(dev);

	void __iomem *ioaddr = pdata->ioaddr;

	u8 century;
@@ -98,8 +97,7 @@ static int ds1553_rtc_set_time(struct device *dev, struct rtc_time *tm) 


static int ds1553_rtc_read_time(struct device *dev, struct rtc_time *tm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);

	struct rtc_plat_data *pdata = dev_get_drvdata(dev);

	void __iomem *ioaddr = pdata->ioaddr;

	unsigned int year, month, day, hour, minute, second, week;

	unsigned int century;
@@ -155,8 +153,7 @@ static void ds1553_rtc_update_alarm(struct rtc_plat_data *pdata) 


static int ds1553_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);

	struct rtc_plat_data *pdata = dev_get_drvdata(dev);



	if (pdata->irq <= 0)

		return -EINVAL;
@@ -172,8 +169,7 @@ static int ds1553_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 


static int ds1553_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);

	struct rtc_plat_data *pdata = dev_get_drvdata(dev);



	if (pdata->irq <= 0)

		return -EINVAL;
@@ -208,8 +204,7 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id) 


static int ds1553_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);

	struct rtc_plat_data *pdata = dev_get_drvdata(dev);



	if (pdata->irq <= 0)

		return -EINVAL;

drivers/rtc/rtc-ds1685.c

+7 −14
Original line number Diff line number Diff line
@@ -267,8 +267,7 @@ ds1685_rtc_get_ssn(struct ds1685_priv *rtc, u8 *ssn) 
static int

ds1685_rtc_read_time(struct device *dev, struct rtc_time *tm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	struct ds1685_priv *rtc = dev_get_drvdata(dev);

	u8 ctrlb, century;

	u8 seconds, minutes, hours, wday, mday, month, years;
@@ -317,8 +316,7 @@ ds1685_rtc_read_time(struct device *dev, struct rtc_time *tm) 
static int

ds1685_rtc_set_time(struct device *dev, struct rtc_time *tm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	struct ds1685_priv *rtc = dev_get_drvdata(dev);

	u8 ctrlb, seconds, minutes, hours, wday, mday, month, years, century;



	/* Fetch the time info from rtc_time. */
@@ -394,8 +392,7 @@ ds1685_rtc_set_time(struct device *dev, struct rtc_time *tm) 
static int

ds1685_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	struct ds1685_priv *rtc = dev_get_drvdata(dev);

	u8 seconds, minutes, hours, mday, ctrlb, ctrlc;

	int ret;
@@ -453,8 +450,7 @@ ds1685_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
static int

ds1685_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	struct ds1685_priv *rtc = dev_get_drvdata(dev);

	u8 ctrlb, seconds, minutes, hours, mday;

	int ret;
@@ -1119,8 +1115,7 @@ static ssize_t 
ds1685_rtc_sysfs_battery_show(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	struct ds1685_priv *rtc = dev_get_drvdata(dev);

	u8 ctrld;



	ctrld = rtc->read(rtc, RTC_CTRL_D);
@@ -1140,8 +1135,7 @@ static ssize_t 
ds1685_rtc_sysfs_auxbatt_show(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	struct ds1685_priv *rtc = dev_get_drvdata(dev);

	u8 ctrl4a;



	ds1685_rtc_switch_to_bank1(rtc);
@@ -1163,8 +1157,7 @@ static ssize_t 
ds1685_rtc_sysfs_serial_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	struct ds1685_priv *rtc = dev_get_drvdata(dev);

	u8 ssn[8];



	ds1685_rtc_switch_to_bank1(rtc);